Merge remote-tracking branch 'upstream/master' into new-equipment

Conflicts:
	src/Ship.cpp