Merge branch 'master' into 6093-refresh-docs
authorradhika <radhika@curoverse.com>
Tue, 9 Jun 2015 14:09:07 +0000 (10:09 -0400)
committerradhika <radhika@curoverse.com>
Tue, 9 Jun 2015 14:09:07 +0000 (10:09 -0400)

Trivial merge