1.5.1
Merge pull request #5650 from dkuhnke/master

1.5.1