(2) Checkout master, get it up to date with upstream, and use

./rbt patch -c

to make your commit