(maint) Add missing class method instance? to TypeCalculator
Merge branch 'master' of ssh://github.com/puppetlabs/puppet.git