[yash/f17] (2 commits) ...Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

Summary of changes:

  6f18005... 2.33 (*)
  f843a60... Merge remote-tracking branch 'origin/master' into f17

(*) This commit already existed in another branch; no separate mail sent