Merge in 'cryptcat'.
Merge in 'crunch'.