Sync up with code that will be merged out shortly
Merge branch 'master' of github.com:jschmerge/xos

Conflicts:
	src/unit/unit_path.cc