Merge pull request #713 from khawkins/unstable

iOS: Merging master back to unstable