GENERATED: adding travis-ci.org support
Merge branch 'master' into userid