Remove sugar_mark_macosx_resources
Merge branch 'update' into update.macosx