master
Merge branch '3007.x' into merge/3007.x/3008.x-26-05-05
Fix 8 file descriptor leaks with comprehensive regression tests
Merge branch '3007.x' into merge/3007.x/3008.x/25-06-08