Merge branch 'cleanups' into 'master'

Cleanups

See merge request !35
11 jobs for master in 9 minutes and 47 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed clang-c++11 #54712
Linux

00:03:36

passed cppcheck #54714
Linux

00:00:47

passed doc #54721
Linux

00:00:21

passed gcc-c++11 #54711
Linux

00:03:55

passed macos-c++11 #54713
Apple

00:01:32

passed VS2013-32-bit #54720
VS2013

00:00:51

passed VS2013-64-bit #54719
VS2013

00:01:02

passed VS2015-32-bit #54718
VS2015

00:01:02

passed VS2015-64-bit #54717
VS2015

00:01:09

passed VS2017-32-bit #54716
VS2017

00:01:11

passed VS2017-64-bit #54715
VS2015

00:01:33