Merging pull request, bumping to 2.5.4