Merge remote-tracking branch 'openstreetmap/pull/1469'
authorTom Hughes <tom@compton.nu>
Tue, 28 Feb 2017 00:21:23 +0000 (00:21 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 28 Feb 2017 00:21:23 +0000 (00:21 +0000)

Trivial merge