Merge "Merge branch 'devel/master' into tizen" into tizen