Merge "Update ResourceLoader for Ib7fc2f939b"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 Oct 2015 00:55:33 +0000 (00:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Oct 2015 00:55:33 +0000 (00:55 +0000)

Trivial merge