Merge with master boromil/Django branch.