Merge remote-tracking branch 'remotes/origin/devel/master' into sandbox/ecore_wl2