Merge branch 'master' into 6093-refresh-docs
authorradhika <radhika@curoverse.com>
Thu, 4 Jun 2015 18:10:33 +0000 (14:10 -0400)
committerradhika <radhika@curoverse.com>
Thu, 4 Jun 2015 18:10:33 +0000 (14:10 -0400)

Trivial merge