Merge branch 'master' into 1.8.x
better support for non-standard charsets
ensuring that modal text is properly closed.
fix for modal nav and comments on the noms
noting significant bugfixes.
Merge branch '1.8.x'