Merge branch 'commentfix-v1-0-x' into 'v1.0.x'

Commentfix v1 0 x



See merge request !15
3 jobs for v1.0.x in 2 minutes and 23 seconds (queued for 1 minute and 55 seconds)