Merge pull request #969 from pwpiwi/gcc10_fixes