Another auto-gen commit. I hope this works.
Merge pull request #1 from TeamKarbonOfficial/derp13-5-2014

Another auto-gen commit. I hope this works.