bugfix
Merge branch 'master' of github.com:Happy-Robots/d7-base