Merge remote-tracking branch 'upstream/master'

diff --combined youtube_dl/__init__.py
index bac9e74c4dc6ac055ac72257ff4594b8f4d1d28f,9b41587e70e4aa2b847d663ccbe905ca81f3310d..b4194494fc86292afb17ed7beb3b7a5cc014a652
--- 1/youtube_dl/__init__.py
--- 2/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@@ -67,6 -67,7 +67,7 @@@ __authors__  = 
      'Charles Chen',
      'Hassaan Ali',
      'Dobrosław Żybort',
+     'David Fabijan',
  )
  
  __license__ = 'Public Domain'
@@@ -352,8 -353,6 +353,8 @@@ def parseOpts(overrideArguments=None)
  
      downloader.add_option('-r', '--rate-limit',
              dest='ratelimit', metavar='LIMIT', help='maximum download rate in bytes per second (e.g. 50K or 4.2M)')
 +    downloader.add_option('--sleep-interval',
 +            dest='sleepinterval', metavar='SLEEPINTERVAL', help='number of seconds to sleep between downloads (default is %default)', default="0")
      downloader.add_option('-R', '--retries',
              dest='retries', metavar='RETRIES', help='number of retries (default is %default)', default=10)
      downloader.add_option('--buffer-size',
@@@ -674,11 -673,6 +675,11 @@@ def _real_main(argv=None)
          if numeric_limit is None:
              parser.error(u'invalid rate limit specified')
          opts.ratelimit = numeric_limit
 +    if opts.sleepinterval is not None:
 +        try:
 +            opts.sleepinterval = abs(int(opts.sleepinterval))
 +        except ValueError:
 +            parser.error(u'invalid sleep interval specified')
      if opts.min_filesize is not None:
          numeric_limit = FileDownloader.parse_bytes(opts.min_filesize)
          if numeric_limit is None:
@@@ -775,7 -769,6 +776,7 @@@
          'restrictfilenames': opts.restrictfilenames,
          'ignoreerrors': opts.ignoreerrors,
          'ratelimit': opts.ratelimit,
 +        'sleepinterval': opts.sleepinterval,
          'nooverwrites': opts.nooverwrites,
          'retries': opts.retries,
          'buffersize': opts.buffersize,