Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11