Comment 13 for bug 1586079

Patches seem to work for me, but I would like to see reviews from other Cores of the project, preferably from Stan Lagun, to verify, that these patches do not accidentally break existing functionality