Fixed character encoding issues in a few demo files.
Merge branch 'v3.0'