Merge with 3.2

#11633 Clarify print buffering (will change again if 13761 adds flush param).