Merge patch from toolchain-2.6 branch?

@b1willaert: This commit has never been merged to toolchain-2.7 or master...
Should we merge it?