Bringing /src/ up to speed with 0.8.6.2