Fixes issue #3484 --HG-- branch : trunk
Yay for my first push! Fixes issue 2144 --HG-- branch : trunk