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