Update
Merge branch '5.4-dev' into 5.4

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