Merge "Stop doing $that = $this in includes/deferred"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Feb 2016 18:16:41 +0000 (18:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Feb 2016 18:16:41 +0000 (18:16 +0000)

Trivial merge