Some special sauce
more goodness
Merge pull request #5147 from joshk/patch-1

Some special sauce