All changes including mine (because Spigot devs screwed up an email)

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>