Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)

modules/jpg/image_loader_jpegd.cpp

@@ -84,9 +84,9 @@ Error jpeg_load_image_from_buffer(Image *p_image,const uint8_t* p_buffer, int p_
 
 	Image::Format fmt;
 	if (comps==1)
-		fmt=Image::FORMAT_GRAYSCALE;
+		fmt=Image::FORMAT_L8;
 	else
-		fmt=Image::FORMAT_RGBA;
+		fmt=Image::FORMAT_RGBA8;
 
 	dw = DVector<uint8_t>::Write();
 	p_image->create(image_width,image_height,0,fmt,data);