JOSM: Upgraded r7054