Avoid ASCII encoding errors, inelegantly, by replacing problematic chars
Merge branch 'develop' into feature/ElementTreeAdapter