sync with stable
sync with stable

hsoft/slimbb,slav0nic/DjangoBB,slav0nic/DjangoBB,agepoly/DjangoBB,hsoft/slimbb,saifrahmed/DjangoBB,slav0nic/DjangoBB,hsoft/slimbb,hsoft/DjangoBB,hsoft/DjangoBB,saifrahmed/DjangoBB,agepoly/DjangoBB,agepoly/DjangoBB,hsoft/DjangoBB,saifrahmed/DjangoBB