- Port revision r2486 to r2527 to the addons and ctf