am a0bad432: Merge change 3237 into donut

Merge commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6'

* commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6':
  Add archquery to the windows make