Fix reloading locale and doc on change
Merge branch 'master' into scrolling