merged patch from stable
1 file changed