Tests for parser combinators
Merge branch 'master' into answers