Cetusek Merge pull request #7 from tsmock/josm-17177