Merge branch 'master' into develop
Hotfix: Fix after relation module update. No more relation_init call exists.
Merge branch 'Hotfix' into develop
Merge remote-tracking branch 'origin/develop'