Fixed compilation on MinGW
Merge commit '2124cd8'