Replace [your name] with my actual name
Merge branch '1.3'