merge in my changes from trunk