closes open-classifieds/openclassifieds2#799
Merge remote-tracking branch 'upstream/master'
closes open-classifieds/openclassifieds2#783
Merge remote-tracking branch 'upstream/master'
closes open-classifieds/openclassifieds2#783