fix bug preventing images being processed
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'

Conflicts:
	retriever/retriever.php