closes https://github.com/open-classifieds/open-eshop/issues/356
Merge branch 'master' of github.com:open-classifieds/open-eshop