Merge pull request #2064 from adudney/6.1.x

Fixed laser remapping