Update
Merge branch '5.3-dev' into 5.3

Conflicts:
	README.md
Update
Merge branch '5.3-dev' into 5.3