Merge branch 'master' of github.com:patrikohlsson/faudio into patrikohlsson-master
Merge branch 'patrikohlsson-master'