add some optimization again, we don't backport that, more testing in master, should be anyway no BIG speedup
add some optimization again, we don't backport that, more testing in master, should be anyway no BIG speedup

hlamer/kate,hlamer/kate,cmacq2/kate,hlamer/kate,sandsmark/kate,hlamer/kate,hlamer/kate,sandsmark/kate,jfmcarreira/kate,jfmcarreira/kate,DickJ/kate,jfmcarreira/kate,hlamer/kate,DickJ/kate,cmacq2/kate,hlamer/kate,hlamer/kate,hlamer/kate,hlamer/kate,DickJ/kate,sandsmark/kate,sandsmark/kate,DickJ/kate,cmacq2/kate