Merge "Snap outline clipping to integer coordinates correctly" into lmp-dev