bug fix from previous merge
bug fix from previous merge

DXCanas/kolibri,lyw07/kolibri,lyw07/kolibri,mrpau/kolibri,lyw07/kolibri,lyw07/kolibri,DXCanas/kolibri,learningequality/kolibri,mrpau/kolibri,indirectlylit/kolibri,DXCanas/kolibri,indirectlylit/kolibri,learningequality/kolibri,indirectlylit/kolibri,learningequality/kolibri,DXCanas/kolibri,learningequality/kolibri,mrpau/kolibri,mrpau/kolibri,indirectlylit/kolibri