Merge the 5.1.31sp1 release back into the mainline.

True to our way of doing QSP versions, this doesn't include any new changes
but just backports of some important bug fixes that were also contained
in version 5.1.32.