am 596fd38a: Merge "Whitelist windows module"

* commit '596fd38af207727d508a63fca39506c90ba29c44':
  Whitelist windows module