missed these cleaning stuff out
Merge branch 'master' into aperture-science

Conflicts:
	core.wsdl