Import upstream source
Updated .gitignore