Merge branch 'master' of /home/john/Development/pspp-window-manager