Merge branch 'master' into debugplugin

Conflicts:
	composer.json
Merge pull request #503 from DominikTo/debugplugin

A few debugplugin updates