Merge branch 'master' into 4523-search-index
authorRadhika Chippada <radhika@curoverse.com>
Tue, 27 Jan 2015 17:38:42 +0000 (12:38 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 27 Jan 2015 17:38:42 +0000 (12:38 -0500)

Trivial merge