Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mods/ctf/ctf_map/ctf_map_core/maps

mods/ctf/ctf_classes/medic.lua

@@ -150,6 +150,7 @@ local function isdiggable(name)
 		name:find("glass" ) or name:find("ice"  ) or
 		name:find("snow"  )
 	)
+	or name:find("stairs:")
 end
 
 local function paxel_stop(pname, reason)
@@ -165,7 +166,7 @@ end
 local function remove_pillar(pos, pname)
 	local name = minetest.get_node(pos).name
 
-	if name:find("default") and isdiggable(name) then
+	if name:find("default") or name:find("stairs") and isdiggable(name) then
 		local player = minetest.get_player_by_name(pname)
 
 		minetest.dig_node(pos)

mods/ctf/ctf_leave_message/init.lua

@@ -0,0 +1,10 @@
+function minetest.send_leave_message(player_name, timed_out)
+	local player = ctf.player(player_name)
+	local tcolor = ctf_colors.get_color(player).css
+
+	local announcement = "*** " ..  minetest.colorize(tcolor, player_name) .. " left the game."
+	if timed_out then
+		announcement = announcement .. " (timed out)"
+	end
+	minetest.chat_send_all(announcement)
+end

mods/ctf/ctf_leave_message/mod.conf

@@ -0,0 +1,3 @@
+name = ctf_leave_message
+depends = ctf, ctf_colors
+description = Colorizes leaving messages

mods/ctf/ctf_match/vote.lua

@@ -53,7 +53,7 @@ function ctf_match.vote_next(name)
 	})
 end
 
-ctf_match.register_on_new_match(vote.clear_vote)
+ctf_match.register_on_new_match(vote.clear)
 
 minetest.register_chatcommand("vote", {
 	privs = {

mods/pvp/shooter

@@ -1 +1 @@
-Subproject commit 5b11d11ca7a837164589a026eb54e8693c4d31c0
+Subproject commit 4733f7e6c792477a702aa172bed34df68e0c8e79