More POM UTF-8 handling.
Merge branch 'develop' into feature/Eight