col lg, playerdelay
Merge remote-tracking branch 'origin/master' into layout
small changes