This changes just cause a merge conflict with the 1.5 branch :(