backport r66295 from trunk (small fix to the previous backport)
1 file changed