Merge "Fix IDEA error in prepareQuickTemplate() call"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Sep 2016 08:20:31 +0000 (08:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Sep 2016 08:20:31 +0000 (08:20 +0000)

Trivial merge