Update to 1.4, fix some git sync problem