Hotfix on 6e20c783.
Wrongly doing an integer division
Merge remote-tracking branch 'origin/master' into 2d-gui