Merge branch "release-0.6.10" into "develop" Summary of the merged in commits: * 3ef07e57: Refurbish the new new chapter 09 on maps