Summary of changes: 2c1b438... import from review #1087734 (*) 21847be... cleanup (*) 29d7222... cleanup (*) (*) This commit already existed in another branch; no separate mail sent