Merge branch 'master' into bug_4688