see #8895 - add most recent changes


git-svn-id: http://josm.openstreetmap.de/svn/trunk@6128 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror