Parsing functions.
Merge branch 'upstream'