Merge branch 'develop' into dependabot/composer/automattic/vipwpcs-3.0.0 #6965

Job	Run time
Parse.ly: 3.1 filter_enabled	8m 36s
Parse.ly: 3.1 filter_disabled	9m 23s
Parse.ly: 3.1 option_enabled	9m 54s
Parse.ly: 3.1 option_disabled	8m 30s
Parse.ly: 3.1 filter_and_option_enabled	10m 17s
Parse.ly: 3.1 filter_and_option_disabled	7m 59s
Parse.ly: filter_enabled	9m 44s
Parse.ly: filter_disabled	8m 21s
Parse.ly: option_enabled	8m 25s
Parse.ly: option_disabled	8m 25s
Parse.ly: filter_and_option_enabled	9m 49s
Parse.ly: filter_and_option_disabled	9m 35s
	1h 48m 58s

Provide feedback