Fix merge of upstream. Removed old links.