Merge branch '1.4-rel' (758fc4a)