Updating with latest state from abandoned SVN repo