Merge branch 'commentfix-master' into 'master'

Fixed comments



See merge request !14
3 jobs for master in 1 minute and 59 seconds (queued for 1 minute and 47 seconds)