Merge branch 'master' into 'py3'

# Conflicts:
#   requirements.txt
4 jobs for py3 in 3 minutes and 20 seconds (queued for 2 seconds)