Merge remote branch 'remotes/origin/upstream'

diff --cc src/lib/ecore_evas/ecore_evas_private.h
Simple merge

diff --cc src/lib/ecore_imf/Ecore_IMF.h
Simple merge

diff --cc src/lib/ecore_imf/ecore_imf_context.c
Simple merge

diff --cc src/lib/ecore_x/Ecore_X.h
Simple merge