Merge "Improve how slashes are stripped from filenames"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Jul 2016 19:58:31 +0000 (19:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Jul 2016 19:58:31 +0000 (19:58 +0000)

Trivial merge