Merge branch 'master' into ppa-daily-trunk