Merge pull request #843 from TheBlueMatt/qrcodedoc