1.7.10 Updating

Resulting code should also work in 1.7.2. (But you really should be
using 1.7.10!!)