fixes from 'master' for 2.13.4