Merge commit '99aa405' into 7.x-native-jp2

Conflicts:
	includes/derivatives.inc
	includes/image_upload.form.inc
	islandora_large_image.install