Check version, auto-update if needed
Merge branch 'update' into update.macosx