Merge branch 'master' into p2p