Neaten up the change to boot.
Merge branch 'patch' into master-merge-ios

Conflicts:
	boot