Merge branch 'master' of goat:git/vrfileman