See the milestone for details; https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 20b34412dc8a3099f658545e8504e1fc1326b3cb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 4add22cc49057ec58284ba12afbf5a7c3c290805 Component: engine