Merge branch 'master' into 4523-full-text-search
authorRadhika Chippada <radhika@curoverse.com>
Thu, 29 Jan 2015 02:56:18 +0000 (21:56 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Thu, 29 Jan 2015 02:56:18 +0000 (21:56 -0500)

Trivial merge