Add user and device to final log (Request #12625).
Merge branch 'master' of ssh://dev.horde.org/horde/git/horde