sugar for my sugar
Merge pull request #3265 from joshk/patch-2

sugar for my sugar