Merge pull request #4742 from MartijnKaijser/13.1rc1