UTF-8 encoding in of the build.
Merge branch 'master' into feature/OptionOrder