Fixed license header and version
Bumped to 5.4
Fixed typo in extension.xml
Merge branch 'master' into stable-5.4

Conflicts:
	extension.xml