Merge branch '6221-datamanager-delete' refs #6221
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 15 Jul 2015 15:02:36 +0000 (11:02 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 15 Jul 2015 15:02:36 +0000 (11:02 -0400)

Trivial merge