Merge "Fix the web updater"