fixes #1525
small docs fix
Merge remote-tracking branch 'origin/maintenance-3.x' into maintenance-3.x