Moved over latest version from pandoc HEAD.