Merge branch 'devel/master (1.2.36+)' into tizen

No match.