Merge branch 'master' into 4426-search-documentation
authorRadhika Chippada <radhika@curoverse.com>
Wed, 11 Mar 2015 17:39:08 +0000 (13:39 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 11 Mar 2015 17:39:08 +0000 (13:39 -0400)

Trivial merge