Merge remote-tracking branch 'origin/upstream'

Conflicts:
	po/cs.po
	po/de.po
	po/el.po
	po/fr.po
	po/it.po
	po/nl.po
	po/pt.po
	po/sl.po
	src/lib/ecore_con/ecore_con_url.c

diff --cc src/lib/ecore/ecore_thread.c
Simple merge

diff --cc src/lib/ecore_con/ecore_con_url.c
Simple merge

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