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

Trivial merge