Merge branch 'master' into develop
Ignore rubinius generated files.
Don't need these lines for TravisCI.
Merge branch 'develop'