Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Thu, 19 Nov 2015 16:12:22 +0000 (11:12 -0500)
committerradhika <radhika@curoverse.com>
Thu, 19 Nov 2015 16:12:22 +0000 (11:12 -0500)

Trivial merge