Port of latest Papa (3.1.2)

Note that I did not update the Baby Parse version number