Merge branch 'petterreinholdtsen-scanner-str-repr' into packaging