Merge remote-tracking branch 'openstreetmap/pull/1172' into next
authorTom Hughes <tom@compton.nu>
Thu, 3 Mar 2016 22:25:58 +0000 (22:25 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 3 Mar 2016 22:25:58 +0000 (22:25 +0000)

Trivial merge