Django 1.5.1
Merge remote-tracking branch 'origin/master'