FIX: race condition in test 534
Merge pull request #393 from reneme/fix-test_534

FIX: Race Condition in Test 534