Merge branch 'fix/gulpfile.js' into 'wrdp'

Merge of fix/gulpfile.js to wrdp

See merge request o2oa/o2oa!2967