Merge branch 'master' into 2.6