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

Trivial merge