Merge branch 'devel/master' into tizen_5.0