1.3.2 release

Merge release code.  Includes a change for #4045.