Obvious commit by Volker (b638abf70a3c9b2815344454946c0931295551be in master) is needed to return a file descriptor.
This obviously isn't used much but it's not nice to ship obviously broken code :-).
This commit (b638abf70a3c9b2815344454946c0931295551be) applies cleanly to 3.6.next and 3.5.next.
Count this as a review by a second Team member :-).
Assigning to Karolin for inclusion.
Pushed to v3-5-test and v3-6-test.
Closing out bug report.