mojo 4 compat
Merge branch 'master' of github.com:plicease/Clustericious

Conflicts:
	Changes