Merge pull request #1 from SpongePowered/master

Pull new commits to my copy.