Pull request from I2SE by lategoodbye