Merge branch 'pixelgeek_windows_script_update'