Small fix for build server "Unmappable characters" in JavaDoc
Merge branch 'development' into development_hans