Merge remote-tracking branch 'origin/upstream'

Conflicts:
	src/bin/edje_cc_out.c
	src/lib/Edje.h
	src/lib/edje_entry.c
	src/lib/edje_private.h

diff --cc src/bin/edje_cc_handlers.c
Simple merge

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

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

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

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