4363: Merge branch 'master' into 4363-less-filename-munging
authorTom Clegg <tom@curoverse.com>
Tue, 18 Nov 2014 08:32:11 +0000 (03:32 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 18 Nov 2014 08:32:11 +0000 (03:32 -0500)

Trivial merge