default off per webmaster request
Merge remote-tracking branch 'origin/stable' into 3.0