Merge branch 'fixes' into 'master'

Fixes

See merge request !20
9 jobs for master in 7 minutes and 35 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #77322
VS2015
VS2015-32-bit

00:01:10

passed #77321
VS2015
VS2015-64-bit

00:01:25

passed #77320
VS2017
VS2017-32-bit

00:01:19

passed #77319
VS2015
VS2017-64-bit

00:01:26

passed #77316
Linux
clang-c++11

00:07:35

passed #77318
Linux
cppcheck

00:05:13

passed #77323
Linux
doc

00:01:44

passed #77315
Linux
gcc-c++11

00:03:57

passed #77317
Apple
macos-c++11

00:01:42