Fix CHANGES merge from 0.1