* merge patch from mcepl