Scanner fix

You have to merge with "patch-1" (scanning laser fix) first.