ENH: code uploaded from svn version 70