Merge branch 'master' into patch-1