Merge master into client-connection

Spout: https://github.com/SpoutDev/Spout/pull/2218
Spout: https://github.com/SpoutDev/Spout/pull/2219
SpoutAPI: https://github.com/SpoutDev/SpoutAPI/pull/566