Merge branch 'master' into 6260-test-datamanager
authorradhika <radhika@curoverse.com>
Thu, 3 Sep 2015 19:53:07 +0000 (15:53 -0400)
committerradhika <radhika@curoverse.com>
Thu, 3 Sep 2015 19:53:07 +0000 (15:53 -0400)

Trivial merge