MarK: Try to fix setting do not respond on safari
Merge branch 'GL' into gh-pages