3781: Merge branch '3781-browser-friendly-servers' into 3781-browser-upload
authorTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 07:25:40 +0000 (02:25 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 07:25:40 +0000 (02:25 -0500)

Trivial merge