Adding rough support for iPhone 6 and 6+.
Merge pull request #1056 from slembcke/develop

Adding rough support for iPhone 6 and 6+.