Dev

Merging dev into master to push iOS 1.36 updates to production.