Merge branch 'master' into lua-coroutine-model

diff --cc src/plugins/lua/multimap.lua
index 4514bc4f7af12fcb4e502aef31991b431759e462,d208855251d5b977ae375797736e217e566f8788..909260681f0abb8422735ecec49fab7ed6c0fa57
--- 1/src/plugins/lua/multimap.lua
--- 2/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@@ -28,7 -28,7 +28,8 @@@ local regexp = require "rspamd_regexp
  local rspamd_expression = require "rspamd_expression"
  local rspamd_ip = require "rspamd_ip"
  local lua_util = require "lua_util"
 +local rspamd_dns = require "rspamd_dns"
+ local lua_selectors = require "lua_selectors"
  local redis_params
  local fun = require "fun"
  local N = 'multimap'