Merge "Update gitignore" into stable-3.5