Incorporates the ``delete_expired_users`` changes.

[toastdriven]

No more data loss. ubernostrum has a pull request in his BB of the same patch, which he previously agreed to apply, so hopefully the final commit looks similar when he gets around to it.

[camilonova]

You should merge this changes.