Merge branch 'master' into chunhtai-patch-1