fix updater crash in release
Merge branch 'master' into android-build