Merge branch 'master' into sampler

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

diff --cc src/io/source_avcodec.c
Simple merge

diff --cc wscript
index 7ce88c1,c973457..3294e50
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -311,16 -294,10 +302,16 @@@ def configure(ctx)
              ctx.msg('Checking if using samplerate', 'no (disabled in double precision mode)',
                      color = 'YELLOW')
      if (ctx.options.enable_samplerate != False):
-         ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
-                 args = '--cflags --libs',
+         ctx.check_cfg(package = 'samplerate',
+                 args = '--cflags --libs samplerate >= 0.0.15',
                  mandatory = ctx.options.enable_samplerate)
  
 +    # check for librubberband
 +    if (ctx.options.enable_rubberband != False):
 +        ctx.check_cfg(package = 'rubberband', atleast_version = '1.3',
 +                args = '--cflags --libs',
 +                mandatory = ctx.options.enable_rubberband)
 +
      # check for jack
      if (ctx.options.enable_jack != False):
          ctx.check_cfg(package = 'jack',