Clean up some BN stuff
Merge remote-tracking branch 'upstream/master' into aes-256-cbc-decrypt-test