Diff from upstream to allow version 0.25.5 of neon - applies with offset to the version in Ubuntu's package.
Diff from upstream to allow version 0.25.5 of neon - applies with offset to the version in Ubuntu's package.