Merge branch 'master' into bug1640