Merge branch 'master' into HEAD
Fixes for Ubuntu
Merge branch 'fixes'