SIGN IN SIGN UP

Issue 11715: Merge multiarch fix from 3.1 branch.

B
Barry Warsaw committed
3178b7dee17bf535b08421a7fe39965ff792c2c7