Matching SVN and making 3.7 compat