Merge pull request #1 from SpongePowered/master