Merge branch 'master' into 3620-admin-only-gear-menu
authorradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 18:00:05 +0000 (14:00 -0400)
committerradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 18:00:05 +0000 (14:00 -0400)

Trivial merge