working build configuration
Merge commit 'cf6703de2e' into appveyor