Summary of changes: 899a061... Latest upstream (3.7) (*) 29ed1fe... Latest upstream. (*) 28f8054... 4.0, latest upstream. (*) (*) This commit already existed in another branch; no separate mail sent