Merge pull request #501 from frank-dittrich/unstable-jumbo

Unstable jumbo: 2 benchmark-unify commits