Merge branch 'devel/master' into sandbox/dkdk/tizen