Merge remote branch 'remotes/origin/upstream'

Conflicts:
	ChangeLog

Change-Id: I9b7ec14bd42b05c72d96b9c3240459dec90883ce

diff --cc src/lib/Evas_GL.h
Simple merge

diff --cc src/modules/engines/gl_common/evas_gl_context.c
Simple merge

diff --cc src/modules/loaders/gif/evas_image_load_gif.c
Simple merge