Merge git://github.com/herbertx/crypto