Remove a bad (unstable, timing-dependent) test.
Merge branch '1.4.x'