Fix issue OE 318

Fix for issue https://github.com/open-classifieds/open-eshop/issues/318
Merge pull request #967 from emanwebdev/patch-3

Fix issue OE 318
Merge remote-tracking branch 'upstream/master'