Merge branch 'devel/master (1.2.31)' into tizen

No match.