Merge branch 'master' into 6880-remove-user-delete-button
authorradhika <radhika@curoverse.com>
Thu, 6 Aug 2015 19:21:45 +0000 (15:21 -0400)
committerradhika <radhika@curoverse.com>
Thu, 6 Aug 2015 19:21:45 +0000 (15:21 -0400)

Trivial merge