Added vanilla updates from revision 653.
Merge branch 'testing' of github.com:hewittc/proxmark3lcd into testing