Merge commit 'fd6277c70f95fac'
authoreileen <emcnaughton@wikimedia.org>
Sat, 29 Apr 2017 02:40:36 +0000 (14:40 +1200)
committereileen <emcnaughton@wikimedia.org>
Sat, 29 Apr 2017 02:40:36 +0000 (14:40 +1200)

Trivial merge