Merge branch '1.4-rel' (44ce6a7) aka 2.0.0