[MRG] Fixed bug 1176079
[MRG] Fixed bug 1176079

pedrobaeza/commission,laydros/commission,abstract-open-solutions/commission,savoirfairelinux/commission,cloud9UG/commission,Antiun/commission,lithint/commission,Endika/commission,raycarnes/commission,yvaucher/commission,rschnapka/commission,Daniel-CA/commission