Merge in 'cutycapt'.
cryptohazemultiforcer: Clean up a bit.