Merge branch '10287-sso-username' refs #10287
authorTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 10:01:43 +0000 (06:01 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 10:01:43 +0000 (06:01 -0400)

Trivial merge