Merge pull request #1011 from Conzar/ppa-ubuntu-fix