3781: Merge branch 'master' into 3781-browser-upload
authorTom Clegg <tom@curoverse.com>
Wed, 10 Dec 2014 05:00:51 +0000 (00:00 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 10 Dec 2014 05:00:51 +0000 (00:00 -0500)

Trivial merge