Update for API changes

SpoutAPI: https://github.com/SpoutDev/SpoutAPI/pull/563
Spout: https://github.com/SpoutDev/Spout/pull/2215

This is also a merge pull.