Fix Makefile for schema
Merge branch 'develop' of git:Minerva/python/minerva into develop
Merge branch 'develop' into release/4.6