Some changes
Merge branch 'CRAFT_HOURLY' of https://github.com/adewinter/thundercats into CRAFT_HOURLY