Merge pull request #160 from aledsage/bump-bouncycastle