sweetalert open-classifieds/openclassifieds2#1006
Merge remote-tracking branch 'upstream/master'