binary 0.5 support
Merge branch 'criterion-0.8'