rebased 1.9.3-head patches
patches for 1.9.3-p392