Fixed deprecation errors relating to text wrap and alignment on iOS 6 deployment target
Merge remote-tracking branch 'upstream/master'