Happy new year!
Merge pull request #2404 from bmcbride/patch-2

Happy new year!