Merge branch 'issue366' into develop
Merge branch 'issue366' into develop
Merge branch 'issue366' into develop
mapImage() now debug=99 means to use old method
Merge branch 'develop' into issue366