Improve iOS build
Merge branch 'update' into update.linux