Merge branch 'master' into 7253-datamanager-test-errors
authorradhika <radhika@curoverse.com>
Wed, 25 Nov 2015 22:21:22 +0000 (17:21 -0500)
committerradhika <radhika@curoverse.com>
Wed, 25 Nov 2015 22:21:22 +0000 (17:21 -0500)

Trivial merge