Merge remote-tracking branch 'osmlab/iD-1.6.0'