Security updates for 2020.05.10

Merged Max Rees requested to merge sec/2020.05.10 into master

Merge request reports