Merge branch 'patch-7' into 'master'