merged fixes of randexp 0.3.4