bundle installed
Merge branch 'master' into base-classes