rebased 2.1-head patches
rebased 1.9.3-head patches
added patches for 1.9.3-p547