Increased timeouts in specs
Merge branch 'develop'