merge windows changes
Authored by: Jean-Francois Dockes 2016-01-29
Parent(s): [0a9d55][218023]
Child(ren): [a9d56a]