Fix updater support
That's dumb
Merge remote-tracking branch 'upstream/master'