Skip modules backup if path doesn't exist
Merge remote-tracking branch 'upstream/master'