<< & >> no longer close after draining
Merge branch 'master' into 2.9