Merge branch '1.1-rel'