Merge "Better path traversal prevention in TemplateParser."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Mar 2017 02:50:32 +0000 (02:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Mar 2017 02:50:32 +0000 (02:50 +0000)

Trivial merge