Summary of changes: 21c6ee3... Import. (*) d04c065... Import. (*) 723f89f... - Upstream update (License clarified). (*) dde5e45... - Upstream update (License clarified). (*) This commit already existed in another branch; no separate mail sent