Merge pull request #2043 from Oldiesmann/release-2.1

! Permission checks weren't always done properly when replying to topics...