iPhone 6 & 6+ Support#7

ipodtouchdude wants to merge 2 commits intojulioverne:masterjulioverne/NonceSet112:masterfrom

ipodtouchdude:masteripodtouchdude/NonceSet112:masterCopy head branch name to clipboard