Clarify template error message (#1209)
Merge branch 'master' of github.com:rg3/youtube-dl