Merged manually
still have to fix the user-popup thing, but we'll fix that later
Please note that blocking a user has other effects, such as: