Fix captions

Merged Leonard Fisser requested to merge fix-captions into master

Merge request reports