Prepare for 1.5.4 release
Merge branch 'master' into phpcs-fixer

Conflicts:
	package.xml