working on #606
Merge branch '2.1.5' of github.com:open-classifieds/openclassifieds2 into 2.1.5