Merge branch 'master' into 2895-no-more-redis
authorradhika <radhika@curoverse.com>
Wed, 4 Jun 2014 15:17:31 +0000 (11:17 -0400)
committerradhika <radhika@curoverse.com>
Wed, 4 Jun 2014 15:17:31 +0000 (11:17 -0400)

Trivial merge