Fix formatting error
Fix various wiki links in configuration files
Merge branch 'develop' into arena-caching