assorted updates (bug #1025977)
6 files changed