Merge branch '10682-localfs-stats'
authorTom Clegg <tom@curoverse.com>
Wed, 11 Jan 2017 15:24:21 +0000 (10:24 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 11 Jan 2017 15:24:21 +0000 (10:24 -0500)
closes #10682


Trivial merge