Merge pull request #2919 from lewurm/random-mini-stuff