Merge tag 'upstream/0.13.1' into tizen