Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop