Closes issue #5203. --HG-- branch : trunk extra : rebase_source : 6a7676a125be28e5b150db9f27d3488899f6c728