General cleanup
Merge branch 'master' into develop

Conflicts:
	Request/Handler.php
Merge branch 'master' into develop