Merge 'rg3/master' into fork_master

diff --cc README.md
index b218fc3eca20217871ca7d202b044278a4f7c385,5789ce2e44b187aa321b09171c5fbd8630eb29f9..2ca021125902f04a6306acec5e2fd5ac922bfa52
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -51,7 -51,7 +51,10 @@@ which means you can modify it, redistri
                               %(upload_date)s for the upload date (YYYYMMDD),
                               %(extractor)s for the provider (youtube, metacafe,
                               etc), %(id)s for the video id and %% for a literal
--                             percent. Use - to output to stdout.
++                             percent. Use - to output to stdout. Can also be
++                             used to download to a different directory, for
++                             example with -o '/my/downloads/%(uploader)s/%(title
++                             )s-%(id)s.%(ext)s' .
      --restrict-filenames     Restrict filenames to only ASCII characters, and
                               avoid "&" and spaces in filenames
      -a, --batch-file FILE    file containing URLs to download ('-' for stdin)

diff --cc youtube_dl/__init__.py
Simple merge