ScrollBar in CharacterGrid
Merge remote-tracking branch 'origin/master'