Patch by: @wraitii Accepted by: @Angen Fixes #5598 Fixes #6225 Differential Revision: https://code.wildfiregames.com/D4183 This was SVN commit r25830.