Change to logic
Merge branch 'master' of https://github.com/vandebm/petulant-shame

Conflicts:
	includes/common/administration.inc