Merge pull request #617 from jackwilsdon/dont-skip-comma

Don't skip an erroneous comma when parsing "from"