Merge branch 'master' into 6277-manifest-validation
authorradhika <radhika@curoverse.com>
Mon, 15 Jun 2015 15:34:37 +0000 (11:34 -0400)
committerradhika <radhika@curoverse.com>
Mon, 15 Jun 2015 15:34:37 +0000 (11:34 -0400)

Trivial merge