Remove deprecation warning
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies