Bring dev up to date with master, add error parsing