Summary of changes: ba20f26... Upstream 2.2.5 (*) b959cfb... Upstream 2.2.5 (*) 3d735cd... Upstream 2.2.5 (*) 204ed97... Upstream 2.2.5 (*) c089bb1... Upstream 2.2.5 (*) 3f2726e... Upstream 2.2.5 (*) (*) This commit already existed in another branch; no separate mail sent