r6003: merge BUG 2521 fix; should be ready for 3.0.13 now