Merge release 6.2.1 into 6.3.x#855

driehle merged 2 commits into6.3.xdoctrine/DoctrineModule:6.3.xfrom

6.2.x-merge-up-into-6.3.x_3YROqq0Jdoctrine/DoctrineModule:6.2.x-merge-up-into-6.3.x_3YROqq0JCopy head branch name to clipboard