Merge branch 'master' into 6027-git-repo-doc
authorradhika <radhika@curoverse.com>
Wed, 2 Dec 2015 22:15:12 +0000 (17:15 -0500)
committerradhika <radhika@curoverse.com>
Wed, 2 Dec 2015 22:15:12 +0000 (17:15 -0500)

Trivial merge