Change master to closer resemble 1.3.x branch for easier merging.