Update patch to be against current "master"