need check relativePath nil, fix bug
Merge remote-tracking branch 'origin/master'