Merge branch 'master' into 'master'

adding and fixing files

See merge request !127
2 jobs for master in 41 seconds (queued for 6 seconds)