Closes issue #4357. --HG-- branch : trunk extra : rebase_source : b829284f60e2b55f8e79db72751252cc6619e59a