Merge branch 'master' into 'v1.0'

Version 1.0.5

See merge request !33
4 jobs for v1.0