More OS-level dependencies for Ubuntu
Merge branch 'master' into develop