Manually committed pull request #1453 by cesare-montresor.