Tidied.
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2