Fix CHANGES path.
Merge branch '1.1'