manually merge changes from mksh-44 branch