Remove version change; merge subsequent changes from trunk