Add ztimeout class
Merge branch 'pull-ztimeout' into wip
Update version and symbols