Merge branch 'master' into ppp-update