iPhone 6/6+ support.
Merge master.