Merge iOS 7 changes in to 2.1

When the iOS 7 changes are ready we should merge them in to the other 2.1 changes assuming the plan is still to release them together.