Copy of SVN master.