Merge branch '4253-user-usernames-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 25 Mar 2015 15:51:08 +0000 (11:51 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 25 Mar 2015 15:51:29 +0000 (11:51 -0400)
Refs #4253.  Closes #5512.


Trivial merge