Adds iOS6 support
Merge branch 'ios6'