#35 Bring V4-3-x branch up to current from svn