Board Thread:Wiki-Related Discussion/@comment-25491743-20150805151057/@comment-26109288-20150808030557

Merge please!