Buildfix (non-windows)
Merge pull request #1621 from raven02/patch-14

Buildfix (non-windows)