Fixes #1105: map support fixes [develop]
Fix merge issue that removed all staff from developer branch :-).
Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..
Merge from SVN branch 1.2.
Release 1.1.1
Release 1.1.0
Release 1.0.0