Merge trunk into develop after the wp-parsely 3.21.1 release#3757

acicovic merged 1 commit intodevelopParsely/wp-parsely:developfrom

trunkParsely/wp-parsely:trunkCopy head branch name to clipboard