Merge remote-tracking branch 'github/master'
qr code generated by text parameter in query string