Fixes #Dafu
Merge branch 'updater' into develop