Fix for #534
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x