Merge branch 'release/v2.9.2' into develop
Add forgotten #cmakedefine to Config.h.in
Merge branch 'develop'