Merge branch '1.3-stable'