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

hartwork committed Aug 7, 2019

…at#299)