(version 1.3.4 as of this commit)

This commit is intended to close INCR-8 issue (see https://openedx.atlassian.net/browse/INCR-8 )