Issue 7092: Fix failing tests in Fx26/Fb1.12 (pull request #111 -
 Thomas Andersen)