Merge branch 'develop' into 1.x-stable
Merge branch '1.x-stable' of https://github.com/Edugate/ResourceRegistry into 1.x-stable