Update to latest master with Spigot Officials