Remove implicit dependency on loading activesupport
Merge branch 'hotfix/1.1.1'