Fix bug 986807 - Compilation issues in Windows and Cygwin environment
Temporary workaround for bug 1292481
Merge branch 'bzr/master'