1.5.4
Merge pull request #7750 from dkuhnke/master

1.5.4