Quick & dirty iOS7 implementation

(a bit busy at the moment, more to come)
Resolved conflicts in upstream merge.