Fix timeout causing a failed test
Merge pull request #1345 from rockfruit/hotfix/next

Fix timeout causing a failed test