Fixed a problem introduced by preceding merge (76178745eb40)
Fixed a problem introduced by preceding merge (76178745eb40)

sccblom/vercors,sccblom/vercors,sccblom/vercors,sccblom/vercors,sccblom/vercors