Merge remote-tracking branch 'openstreetmap/pull/1208'
authorTom Hughes <tom@compton.nu>
Sun, 24 Apr 2016 17:42:47 +0000 (18:42 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 24 Apr 2016 17:42:47 +0000 (18:42 +0100)

Trivial merge