
        Merge branch 'david-loffredo-rand_s-test' (libexpat#302, fixes libexp…

e9db1a7