Preappended return code
Merge branch 'master' of github.com:shadow7412/sp1

Conflicts:
	activate