4.2: bugfix in generating new random points, will now more likely terminate
Merge branch 'master' into HEAD