Upgrade from 1.3 to 1.31

Forgot to comment out some debugging code in 1.3 release.