iOS 8 / iPhone 6/6+ layout issues
Merge remote-tracking branch 'origin/master'