#18 Add support for new OPTIONAL MATCH clause in 2.0.0-RC1