z-quotes Merge branch 'v1' into z-quotes
# Conflicts:
# lib/dpl/provider/pypi.rb
# spec/provider/pypi_spec.rb
Join over 500,000 developers testing and building on Travis CI
# Conflicts:
# lib/dpl/provider/pypi.rb
# spec/provider/pypi_spec.rb