Merge 2.10.x to 2.11.x

Only a whitespace conflict.