Merge "Merge branch '1.3-rel' (5a1209c)"