Merge remote-tracking branch 'osmlab/iD-1.6.0'
authorTom Hughes <tom@compton.nu>
Fri, 17 Oct 2014 16:21:37 +0000 (17:21 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 17 Oct 2014 16:21:37 +0000 (17:21 +0100)

Trivial merge