make sure  is set to the error
Merge remote-tracking branch 'origin/master' into experimental/p5-mop

Conflicts:
	lib/Action/Retry.pm