Merge remote-tracking branch 'origin'
Merge branch 'master' of github.com:PhillipTaylor/konsole
Merge branch 'master' of github.com:PhillipTaylor/konsole