am 7bd30b73: Merge "Whitelist windows module"

* commit '7bd30b73c2aaf996ebb30f1dcc8765e329bddaab':
  Whitelist windows module