Update

By the way, if anyone wonders by ./force-head doesn't work anymore,
use the waf-plus-kill-submodules branch.
Merge branch 'master' into divVerent/no-more-submodules

Conflicts:
	ffmpeg
	mpv