For some reason, merging with master didn't actually copy all of the changes.
Works now.