Merge pull request #3035 from techee/different_parsers