Fix a warning about anti-alias grids
Merge remote-tracking branch 'origin/master'