Apply patch #3108246: Patch for better windows installer