chalasr Merge branch '6.0' into 6.1
4d216a2 Sep 21, 2022
Merge branch '6.0' into 6.1
* 6.0:
  Remove non-empty-string PHPDoc annotations
4d216a2