[pull] develop from craftcms:develop#129

Merged

pull[bot] merged 2 commits intoClockworkNet:developfrom

craftcms:develop

Jul 15, 2020

Commits on Jul 15, 2020

Fixes #6351

joshuabaker
authored and
brandonkelly
committed
Release note for #6351 / #6386, plus a little cleanup
brandonkelly
committed