Addded stuff to changelist for the merged branch. Bump version.