Protect against unset current_path
Merge remote-tracking branch 'origin/3.0-stable'
Typo in merge