Merge branch 'master' into 'master'

Update proff

See merge request !51
3 jobs for master in 3 minutes and 9 seconds (queued for 3 seconds)