Merge branch 'tizen', remote-tracking branch 'upstream/master'