Merge branch 'master' into 6588-documentation
authorradhika <radhika@curoverse.com>
Fri, 31 Jul 2015 15:36:28 +0000 (11:36 -0400)
committerradhika <radhika@curoverse.com>
Fri, 31 Jul 2015 15:36:28 +0000 (11:36 -0400)

Trivial merge