Cherry Picking old Pull Requests

Forgot to cherry pick them on the mybb repo...