Merge branch '9799-nonadmin-logs'
authorTom Clegg <tom@curoverse.com>
Mon, 5 Sep 2016 20:19:31 +0000 (16:19 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 5 Sep 2016 20:19:31 +0000 (16:19 -0400)
closes #9799


Trivial merge