Merging from Testing on iPhone...

Merging the hard way. Git is funny sometimes.