am 316ed876: Merge "Whitelist windows modules"

* commit '316ed876bc5be0f5c67493ae37afc140fe07c0f2':
  Whitelist windows modules