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