Merge branch 'master' into 'p1'

# Conflicts:
#   doc/conf.py
12 jobs for p1 in 2 minutes and 15 seconds (queued for 8 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_27 #30732
conda-linux

00:00:46

passed build_linux_34 #30734
conda-linux

00:00:49

passed build_linux_35 #30736
conda-linux

00:00:44

passed build_macosx_27 #30737
conda-macosx

00:01:12

passed build_macosx_34 #30735
conda-macosx

00:01:03

passed build_macosx_35 #30733
conda-macosx

00:01:03

 
  Test
passed test_linux_27 #30742
conda-linux

00:00:37

65.0%
passed test_linux_34 #30740
conda-linux

00:00:40

65.0%
passed test_linux_35 #30738
conda-linux

00:00:36

65.0%
passed test_macosx_27 #30739
conda-macosx

00:00:58

65.0%
passed test_macosx_34 #30741
conda-macosx

00:00:53

65.0%
passed test_macosx_35 #30743
conda-macosx

00:00:52

65.0%