Merge branch 'multiline-parsing'