Merge remote-tracking branch 'origin/devel/master' into tizen

No match.