Merge remote-tracking branch 'openstreetmap/pull/1279'
authorTom Hughes <tom@compton.nu>
Thu, 8 Sep 2016 18:26:07 +0000 (19:26 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 8 Sep 2016 18:26:07 +0000 (19:26 +0100)

Trivial merge