Merge branch 'rand-compat'

Fixes #6