Merge branch 'master' of github.com:wate/clink_completion