Merge branch 'master' into 4523-full-text-search
authorRadhika Chippada <radhika@curoverse.com>
Tue, 10 Feb 2015 15:41:44 +0000 (10:41 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 10 Feb 2015 15:41:44 +0000 (10:41 -0500)

Trivial merge