slight change to the scroll area size
Merge branch 'master' into kevin
Merge branch 'master' into kevin
Merge branch 'master' into kevin