Making a note for us to review the patch from MarcoZ at:
http://ios.trac.wordpress.org/ticket/1601