Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/modelcatalogue/modelcatalogue-browser into develop
Fixes MC-304