#1128 user reports
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing