Merge branch 'various_fixes' into 'master'

Various fixes

Closes #1 as well.

See merge request !2
15 jobs for master in 100 minutes and 47 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_27 #20501
conda-linux

00:02:33

passed build_linux_34 #20502
conda-linux

00:02:33

passed build_linux_35 #20503
conda-linux

00:02:34

passed build_macosx_27 #20504
conda-macosx

00:01:11

passed build_macosx_34 #20505
conda-macosx

00:01:05

passed build_macosx_35 #20506
conda-macosx

00:01:08

 
  Test
passed test_linux_27 #20522
conda-linux

00:08:09

56.0%
passed test_linux_34 #20523
conda-linux

00:08:05

56.0%
passed test_linux_35 #20524
conda-linux

00:08:07

56.0%
passed test_macosx_27 #20525
conda-macosx

00:20:13

56.0%
passed test_macosx_34 #20526
conda-macosx

00:19:20

56.0%
passed test_macosx_35 #20527
conda-macosx

00:19:13

56.0%
 
  Docs
passed docs_linux_35 #20545
conda-linux

00:02:07

 
  Wheels
passed wheels_linux_27 #20555
conda-linux

00:02:14

passed wheels_linux_35 #20556
conda-linux

00:02:15