Merge branch 'devel/x11' into tizen