Fixed image manipulation memory thing again... because I forgot the e in jpeg.
Merge branch '4.0-devel' into 4.1-devel