Expand tilde in template (Fixes #1639)
Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/YoutubeDL.py