* Sync upstream
* Various and sundry mobile iOS fixes prompted by @mp607