1.1-dev: actually merge in the changes properly