5824: Merge branch 'master' into 5824-keep-web
authorTom Clegg <tom@curoverse.com>
Wed, 4 Nov 2015 04:06:45 +0000 (23:06 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 4 Nov 2015 04:06:45 +0000 (23:06 -0500)

Trivial merge