preparing for a new release
Merge branch 'master' into django1.5