Update upstream versions, notable fix being reduction in ocelot spawning due to modified persistance 'hack'.