Merging the forum parsing code into master

Using a PR to have a centralized diff