Merge branch 'master' into 5247-anonymous-doc
authorRadhika Chippada <radhika@curoverse.com>
Wed, 25 Mar 2015 17:37:18 +0000 (13:37 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 25 Mar 2015 17:37:18 +0000 (13:37 -0400)

Trivial merge