Merge remote-tracking branch 'openstreetmap/pull/1416'
authorTom Hughes <tom@compton.nu>
Thu, 26 Jan 2017 17:51:13 +0000 (17:51 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 26 Jan 2017 17:51:13 +0000 (17:51 +0000)

Trivial merge