[FIX] Merge fails - loop modified
[FIX] Merge fails - loop modified

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