castor enabled
Merge pull request #4380 from civanch/castor_enabled

Castor enabled.