Increasing test timeout to allow for slow dev machines
Merge branch 'release' into dev