Sanitization
Merge branch 'master' of github.com:jstimpfle/adminscripts

Conflicts:
	remembered-job