Merge branch 'master' of piem.org:/git/aubio/aubio