Django 1.4/1.5 compatibility
Merge branch 'bootstrap2.2'