Merge branch 'master' into 3642-search-for-active-only
authorradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 18:04:48 +0000 (14:04 -0400)
committerradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 18:04:48 +0000 (14:04 -0400)

Trivial merge