Merge branch 'master' into multi-monitor
drwxr-xr-x - cde