Merge branch 'master' into ubuntu
Merge branch 'ubuntu' of https://github.com/rubund/gnuais into ubuntu