Merge branch 'ios7'