Fix fabfile OSTYPE isn't always available apparently
Merge commit 'a9323964fb013ba9713af2003c2d452b57fc15d4' into develop

Conflicts:
	fabfile.py