QR code working
Merge remote-tracking branch 'upstream/master' into vb573
Merge pull request #606 from balabhv/vb573

QR Code stuff works