Merge branch 'master' into 4523-search-index
authorRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 16:15:33 +0000 (11:15 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 14 Jan 2015 16:15:33 +0000 (11:15 -0500)

Trivial merge