Merge branch 'master' into alainmarcel-patch-1