closes https://github.com/open-classifieds/openclassifieds2/issues/1049
Merge branch 'master' of github.com:open-classifieds/common