Merge "Add script to help with merging from upstream"