Merge remote-tracking branch 'remotes/origin/upstream/1.6' into tizen