update from svn for 1.0.3, part 3