Merge remote-tracking branch 'remotes/origin/upstream'

diff --cc ChangeLog
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_ews.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_x.c
Simple merge

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

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