Merge aubio.org:/git/aubio/aubio into develop