Merge branch 'master' into 6277-manifest-validation
authorradhika <radhika@curoverse.com>
Sun, 14 Jun 2015 00:47:04 +0000 (20:47 -0400)
committerradhika <radhika@curoverse.com>
Sun, 14 Jun 2015 00:47:04 +0000 (20:47 -0400)

Trivial merge