There have been a few months worth of changes, so
I'm updating to the latest with these patches: