Non-Windows buildfix
Merge pull request #1030 from mikusp/master

Non-Windows buildfix