Update from upstream
Expand upon why this should be added to 2.7