Please merge changes to master.

Blah blah blah.
tempInt is not used.