Merge branch 'master' into debugplugin

Conflicts:
	composer.json
moved to new location
typo
a bit less noise
handle auth header
exception logging
Merge branch 'master' into debugplugin
Merge remote-tracking branch 'upstream/master' into debugplugin
debugplugin updates
Merge pull request #503 from DominikTo/debugplugin

A few debugplugin updates