Merge branch 'master' into barcode-scanner