Ensuring common names can be properly removed when harvesting archives
Merge remote-tracking branch 'upstream3/master'