Merge branch 'master' into 6859-fix-invalid-manifests
authorradhika <radhika@curoverse.com>
Wed, 26 Aug 2015 22:06:17 +0000 (18:06 -0400)
committerradhika <radhika@curoverse.com>
Wed, 26 Aug 2015 22:06:17 +0000 (18:06 -0400)

Trivial merge