fix double downloads
Merged 'dev'.