Update jun21

Merged Lars Nieder requested to merge update_jun21 into master

Fixed two links.

Merge request reports