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

Trivial merge