Merge branch 'waf-build-tweaks' of https://github.com/emuell/aubio