Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Mon, 17 Aug 2015 14:59:34 +0000 (10:59 -0400)
committerradhika <radhika@curoverse.com>
Mon, 17 Aug 2015 14:59:34 +0000 (10:59 -0400)

Trivial merge