Merge branch 'erbridge-probable_primes'