Move #3474 from bugfixes to security fixes
Move #3474 from bugfixes to security fixes

mvidalgarcia/indico,ThiefMaster/indico,DirkHoffmann/indico,indico/indico,mvidalgarcia/indico,ThiefMaster/indico,OmeGak/indico,indico/indico,pferreir/indico,mic4ael/indico,pferreir/indico,OmeGak/indico,ThiefMaster/indico,OmeGak/indico,pferreir/indico,DirkHoffmann/indico,indico/indico,OmeGak/indico,indico/indico,mic4ael/indico,mic4ael/indico,mic4ael/indico,mvidalgarcia/indico,pferreir/indico,DirkHoffmann/indico,mvidalgarcia/indico,ThiefMaster/indico,DirkHoffmann/indico