Merge pull request #2428 from leonghui/update_wiki_links