Minor change to delete_non_test_folders
Merge branch 'master' into wip