Merge branch 'issue-1105' into 'master'
Issue #1105: map support fixes
See merge request freenetis/freenetis!47
Merge branch 'issue-1105' into 'master'
Issue #1105: map support fixes
See merge request freenetis/freenetis!47