Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Fri, 13 Nov 2015 18:05:09 +0000 (13:05 -0500)
committerradhika <radhika@curoverse.com>
Fri, 13 Nov 2015 18:05:09 +0000 (13:05 -0500)

Trivial merge