gitignore should be working
Merge remote-tracking branch 'origin/r3_upgrade' into r3_upgrade

3_upgrade

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.