Tidy up
Merge branch 'master' of github.com:kaihendry/systemd-escape
Working both ways