Preparation for specialisation system
Merge branch 'master' of https://github.com/Derius/Derius-Core/