Display and use scrollbars in edit windows when controls are too large to
fit in window.
Merge remote-tracking branch 'obsy/master'