increasing testing timeouts
Update build number
Merge branch 'master' into develop