Properly forward err to secho
Merge branch '3.x-maintenance'