Merge branch 'master' into 6277-manifest-validation-api
authorradhika <radhika@curoverse.com>
Wed, 17 Jun 2015 22:54:36 +0000 (18:54 -0400)
committerradhika <radhika@curoverse.com>
Wed, 17 Jun 2015 22:54:36 +0000 (18:54 -0400)

Trivial merge