5416: Merge branch 'master' into 5416-git-auth-token
authorTom Clegg <tom@curoverse.com>
Tue, 17 Mar 2015 14:57:35 +0000 (10:57 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 17 Mar 2015 14:57:35 +0000 (10:57 -0400)

Trivial merge