Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop