merge origin/master
merge origin/master

dstufft/cryptography,Lukasa/cryptography,Hasimir/cryptography,Ayrx/cryptography,Lukasa/cryptography,kimvais/cryptography,Hasimir/cryptography,kimvais/cryptography,Hasimir/cryptography,Lukasa/cryptography,bwhmather/cryptography,bwhmather/cryptography,dstufft/cryptography,bwhmather/cryptography,skeuomorf/cryptography,Ayrx/cryptography,kimvais/cryptography,dstufft/cryptography,Ayrx/cryptography,sholsapp/cryptography,glyph/cryptography,skeuomorf/cryptography,dstufft/cryptography,sholsapp/cryptography,Ayrx/cryptography,glyph/cryptography,kimvais/cryptography,skeuomorf/cryptography,Hasimir/cryptography,dstufft/cryptography,sholsapp/cryptography,sholsapp/cryptography,bwhmather/cryptography,skeuomorf/cryptography