Merge "Add image/pjpeg as an alias for image/jpeg"