--HG-- branch : trunk
closes issue 4669 (first 5 patches rolled into 1) Patch by Paradox --HG-- branch : trunk