Merge branch '5176-escape-filenames'
authorBrett Smith <brett@curoverse.com>
Tue, 10 Feb 2015 01:12:17 +0000 (20:12 -0500)
committerBrett Smith <brett@curoverse.com>
Tue, 10 Feb 2015 01:12:50 +0000 (20:12 -0500)
Closes #5176, #5180.


Trivial merge