Merge pull request #2026 from reaperhulk/small-cleanup

cleanup a doctest and add a changelog entry for concatkdf