Merge branch 'master' into feature/pytest

diff --cc MANIFEST.in
index a7801f8,c16c93a..4b14a70
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -1,10 -1,11 +1,10 @@@
  include AUTHORS COPYING README.md VERSION ChangeLog
  include python/README.md
  include this_version.py
+ include waf
+ recursive-include waflib *.py
  include Makefile wscript */wscript_build
- include waf waflib/* waflib/*/*
- exclude waflib/__pycache__/*
  include aubio.pc.in
 -include nose2.cfg
  include requirements.txt
  include src/*.c src/*.h
  include src/*/*.c src/*/*.h

diff --cc setup.py
Simple merge