Merge pull request #4314 from MartijnKaijser/beta1