Remove deprecated property
Add required functions

A sign that inheritance is not optimal
Merge branch 'master' into issue-629
Merge pull request #629 from humanmade/issue-629

Intercom array_merge warning