Avoid double-borders by setting empty borders for scroll panes
Merge remote-tracking branch 'pms/master'