Catch up with master, so klickverbot works with some reasonably up-to-date code.