Merge branch 'wget-replacement'