Merge branch 'master' into 'p1'

# Conflicts:
#   requirements.txt
4 jobs for p1 in 35 minutes and 35 seconds (queued for 6 minutes and 28 seconds)
Status Job ID Name Coverage
  Build
passed #124404
docker
build_linux_27

00:29:36

passed #124405
docker
build_linux_36

00:16:31

passed #124406
macosx
build_macosx_27

00:20:49

passed #124407
macosx
build_macosx_36

00:20:21