closes #7534
authorradhika <radhika@curoverse.com>
Tue, 3 Nov 2015 15:43:33 +0000 (10:43 -0500)
committerradhika <radhika@curoverse.com>
Tue, 3 Nov 2015 15:43:33 +0000 (10:43 -0500)
Merge branch '7534-superuser-token'


Trivial merge