Merged in develop (pull request #1)

merge django 1.6