WIP, temporary
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Clean/External/Channel/ImageChannel.php
WIP, temporary