might fix auto-update dialog bug
merge branch 'dev'