Summary of changes: 900720e... Latest upstream with cleaning and reorganization. (*) c2ff185... Latest upstream with a bugfix to consumer loading. (*) (*) This commit already existed in another branch; no separate mail sent