Parser and consistency fixes#614

marcoeilers merged 5 commits into

masterviperproject/silver:masterfrom

meilers_parser_fixesviperproject/silver:meilers_parser_fixesCopy head branch name to clipboard