Merge branch 'master' into 6588-documentation
authorradhika <radhika@curoverse.com>
Tue, 4 Aug 2015 20:20:04 +0000 (16:20 -0400)
committerradhika <radhika@curoverse.com>
Tue, 4 Aug 2015 20:20:04 +0000 (16:20 -0400)

Trivial merge