Merge tag 'upstream/0.12.1' into tizen

No match.