merge scrolltip-enable-opt.patch into Scrolltip.patch