Test for Bug 1884496 (not buggy on trunk).
merge trunk