Build fix
Merge pull request #3642 from raven02/patch-14

Build fix