Merge branch 'master' into 6260-test-datamanager
authorradhika <radhika@curoverse.com>
Wed, 26 Aug 2015 22:05:39 +0000 (18:05 -0400)
committerradhika <radhika@curoverse.com>
Wed, 26 Aug 2015 22:05:39 +0000 (18:05 -0400)

Trivial merge