Merge Tridge's fix for the winbind 32/64bit padding.