3781: Merge branch 'master' into 3781-browser-upload
authorTom Clegg <tom@curoverse.com>
Sat, 6 Dec 2014 01:46:05 +0000 (20:46 -0500)
committerTom Clegg <tom@curoverse.com>
Sat, 6 Dec 2014 01:46:05 +0000 (20:46 -0500)

Trivial merge