Merge branch 'guile-reauth' into 'master'