Added branch switch to master
Added a timeout helper to kill long running tests
Merge branch 'refs/heads/dev'