1.5.6
Merge pull request #9245 from dkuhnke/master

1.5.6