Auto-Merge pull request #2955 from octo/linux-2.4