Merge branch 'master' into next (with 'pu')