Merge upstream changes to rdp file parsing.