Backports: Updates from 6.7.0#281

cbravobernal wants to merge 8 commits intotrunkWordPress/secure-custom-fields:trunkfrom

update/backport-6-7-0WordPress/secure-custom-fields:update/backport-6-7-0Copy head branch name to clipboard