merge from pyproj svn