Summary of changes: 0919faf... Upstream update. (*) e514c88... Merge cleanup. (*) 5cfa7ab... Merge cleanup. (*) This commit already existed in another branch; no separate mail sent