#1130 fixed invalid literal
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing