3775: Merge branch 'master' into 3775-fetch-git-repo
authorTom Clegg <tom@curoverse.com>
Fri, 3 Oct 2014 14:47:13 +0000 (10:47 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 3 Oct 2014 14:47:13 +0000 (10:47 -0400)

Trivial merge