Merge branch 'master' into 7010-git-version
authorradhika <radhika@curoverse.com>
Thu, 20 Aug 2015 20:03:21 +0000 (16:03 -0400)
committerradhika <radhika@curoverse.com>
Thu, 20 Aug 2015 20:03:21 +0000 (16:03 -0400)

Trivial merge