Merging pull request, bumping to 2.5.4
Merge branch 'master' of git://github.com/rslifka/elasticity