Merged the changes from the current windows port
Authored by: Jean-Francois Dockes 2015-09-25
Parent(s): [99adea][bf779a]
Child(ren): [7180de]