Merge remote-tracking branch 'working/user/csharp/lp1446860-staff-can-edit-themselves...
authorBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 14:50:53 +0000 (07:50 -0700)
committerBill Erickson <berickxx@gmail.com>
Tue, 9 Jun 2015 14:50:53 +0000 (07:50 -0700)

Trivial merge