5824: Merge branch 'master' into 5824-keep-web
authorTom Clegg <tom@curoverse.com>
Fri, 30 Oct 2015 18:22:21 +0000 (14:22 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Oct 2015 18:22:21 +0000 (14:22 -0400)

Trivial merge