Updating with several months of changes from the svn repo.