Merge branch '9518-username-conflict'
authorTom Clegg <tom@curoverse.com>
Wed, 29 Jun 2016 19:55:11 +0000 (15:55 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 29 Jun 2016 19:55:11 +0000 (15:55 -0400)
commit2a30f6a162a59ff5a75b9fcdef4913baeeae6a1e
tree75d2a6764de97e44f87701af245b4a6d34510b29
parentafabb6c30c449d6139aec344d0912fc2645e2e89
parent7f5e5b88c9161cbec69725108e438aa1532acaf5
Merge branch '9518-username-conflict'

closes #9518