Vanilla/Vanilla — pull request #632 by kitskub (2013-07-02 17:03:29+00:00)
Title: 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