Merge branch 'mbs-357'

* mbs-357:
  MBS-357: Add a long running process to bcrypt passwords
Merge branch 'master' into beta

* master: