Merge remote-tracking branch 'upstream/master' into feature/mergeconfigfiles

Conflicts:
	config.dist.php
Fix example for multiple channels in config
Uncomment plugin configuration so it is't used when nothing is configurated in config.php
Merge branch 'feature/mergeconfigfiles'