Merge branch 'cleaning' into 'master'

Cleaning

See merge request !50
8 jobs for master in 4 minutes and 15 seconds (queued for 1 second)