553: Merge pull request #328 from aaronbrethorst/develop-/fix-321

iPhone 6/6 Plus/iOS 8 Fixes