Fixes log message when return_to match failures occur.

Fixes #249
Merge remote-tracking branch 'origin/v4.0' into v4.0