Import from akisakanakatana/nicovideo-dl
Merge branch 'akisakanakatana'

Conflicts:
	nicovideo-dl