Merge branch 'master' into hide_errors