Merge branch '10276-remove-data-manager' closes #10276
authorTom Clegg <tom@curoverse.com>
Fri, 9 Dec 2016 22:11:16 +0000 (17:11 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 9 Dec 2016 22:11:16 +0000 (17:11 -0500)

Trivial merge