Fix incorrectly-labeled test.
Merge branch '1.4.x'