port to 1.7.10

I could not wait longer. :)