Merge branch 'master' into feature/timestretch

diff --cc .travis.yml
index 7051826,788e206..6577424
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -73,10 -72,8 +73,10 @@@ addons
      - sox
      - ffmpeg
      - libsndfile
 +    - libsamplerate
 +    - rubberband
      - lcov
-     #update: true
+     update: true
  
  before_install:
     - |

diff --cc python/lib/gen_code.py
Simple merge

diff --cc python/lib/gen_external.py
Simple merge