Initial Commit
Merged upstream changes on dev.forums
Forgot a couple in the merge