Removed to testsuite otherwise unused function typeOf
Merge branch 'master' into dev