Merge pull request #794 from remakeelectric/wiki-links