Include sonatype fixes from 2.0.5.