Merge master into qrcode_encode