Merge branch 'master' into 4523-full-text-search
authorRadhika Chippada <radhika@curoverse.com>
Tue, 20 Jan 2015 20:05:43 +0000 (15:05 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 20 Jan 2015 20:05:43 +0000 (15:05 -0500)

Trivial merge