Merge "Fix exception in MakeFileParser"