incorporating changes from #574 fixing #567 (contributed by CameronBaffuto)
incorporating changes from #574 fixing #567 (contributed by CameronBaffuto)

hotosm/learnosm,hotosm/learnosm,hotosm/learnosm,hotosm/learnosm