Merge branch 'master' into 7253-datamanager-test-errors
authorradhika <radhika@curoverse.com>
Thu, 26 Nov 2015 03:52:29 +0000 (22:52 -0500)
committerradhika <radhika@curoverse.com>
Thu, 26 Nov 2015 03:52:29 +0000 (22:52 -0500)

Trivial merge