* commit '87465f02e4113542bb203232fed0c0f1f67f9a17': Fixes cache misses and extra allocations. Bug #3421454