Merge branch 'master' into 6617-doc-repo-https-url
authorradhika <radhika@curoverse.com>
Mon, 20 Jul 2015 17:47:21 +0000 (13:47 -0400)
committerradhika <radhika@curoverse.com>
Mon, 20 Jul 2015 17:47:21 +0000 (13:47 -0400)

Trivial merge