* fix bug in rescue.
Merge remote-tracking branch 'origin/master'