Fixed typos
Change repo to library in revert commit msg
Merge branch '1.4'

Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po