Fixes WCM-879
Merge remote-tracking branch 'olemi/WCM-879'
Merge branch 'master' of https://github.com/jCatalog/weceem-plugin