Merge branch 'master' into pandora-port