fiiine no haddock :(
Merge branch 'master' into secure-random