Merge branch 'update' into update.macosx