Merge branch 'dev': now compatible with ModLoader.