Merge pull request #2464 from alex/more-aggressive

Provide more aggressive language about dropping 2.6