Added reset_user_deadline for #388.
Merge branch 'master' of github.com:galah-group/galah