Ctrl-L should do its normal refresh screen, as well as the extra stuff
Merge branch 'master' into mac_compat_DEV