Merge branch 'master' of https://github.com/pierrec/go-flags