change -a to -rlptD to avoid preserving owner and group
Merge remote-tracking branch 'upstream/master'