Fix syntax error introduced in 18e658bcaf63cfee8248f877249b19c1d99cdf6d
Merge branch '4.0' into 4.1
Merge branch '4.1'