Summary of changes: 85dc6af... Add ~20 significant fixes from upstream stable branch (*) 3e04602... Add ~20 significant fixes from upstream stable branch (*) This commit already existed in another branch; no separate mail sent