Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/Request/ImageRequest.php
#	src/Service/PlaceholderGenerator.php