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