Merge pull request #2373 from pulpe/_description_fixes