Merge branch 'jc-thread-safe-bcrypt'