Modify dep calculations
Merge remote-tracking branch 'origin/master'

Conflicts:
	build_stage3.sh
make network-online.target.wants directory