WL-3389
Merge branch 'sakai-10.x' of github.com:ox-it/wl-sakai into sakai-10.x