Fixing some outstanding issues with temp.
Revert "Fixing some outstanding issues with temp."

This reverts commit e579ce2a7d773c3bbb7def41e33ddbf1d0d77d0d.
Fixes issue #746
Regenerated signature tests
Updated from upstream/master
Merge pull request #749 from colinbull/master

Fixes issue #746