Merge branch 'patch-11' into 'master'