Merge branch 'cleanup/extra-semicolon' into 'master'

Ansgar Burchardtrequested to merge
cherry-pick-e683e1df into releases/2.5

[cleanup] fix warning: extra ‘;’ [-Wpedantic]

This removes the extra ‘;’ warnings when compiling with -Wpedantic.

See merge request !176 (merged)

Merge request reports