New build.
Fix charset.
Templates injection.
New build
Merge branch 'master' into release