Merge the utc-time branch with master and use that to get 'timeout' func.