iOS: Merging master back to unstable