merge 1.4.1 fixes from master