Merge branch 'master' into develop
Merge branch 'hotfix/next' of http://github.com/bikalabs/bika.health into hotfix/next
LIMS-1256 Health icons not used. And 1 more # Override.zcml doesn't work with images.