Merge pull request #4960 from philenotfound/at-bump