Commit local changes
Merge branch 'master' of https://github.com/MartyThornley/import-external-images

Conflicts:
	import-external-images.php