Handle 'Billable is a premium feature', fixes #291
Merge branch 'master' into builds
7.744