6 plus changes
Merge branch 'iphone6-optimizations'