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

* 'sakai-10.x' of ssh://github.com/ox-it/wl-sakai:
  WL-3320 WL-3316