Merge branch 'ppa-daily-trunk'