Fix 1656 - & needs specific quoting under Windows
Merge pull request #1684 from tangledhelix/feature-windows-ampersand

Fix 1656 - & needs specific quoting under Windows. Closes #1656.
Merge remote-tracking branch 'upstream/master'