Merge branch 'master' into 7255-manifests-in-datamanager
authorradhika <radhika@curoverse.com>
Fri, 20 Nov 2015 14:41:38 +0000 (09:41 -0500)
committerradhika <radhika@curoverse.com>
Fri, 20 Nov 2015 14:41:38 +0000 (09:41 -0500)

Trivial merge