Merge branch 'master' into 2290-user-activity
authorTom Clegg <tom@curoverse.com>
Sun, 16 Mar 2014 21:16:39 +0000 (17:16 -0400)
committerTom Clegg <tom@curoverse.com>
Sun, 16 Mar 2014 21:16:39 +0000 (17:16 -0400)

Trivial merge