Merge branch '8128-crunch2-auth-api'
authorTom Clegg <tom@curoverse.com>
Thu, 12 May 2016 15:34:51 +0000 (11:34 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 12 May 2016 15:34:51 +0000 (11:34 -0400)
closes #8128


Trivial merge