Merge branch 'fix-temp-var-type-deprecation-logic' into 'master'

Fix, and test, temp_var_type deprecation logic

Closes #160

See merge request !311