I changed it as per above and it passes. I guess it is fixed on master. :-)  When I get a moment, I'll run my tests against code built from master and confirm that they still pass. 

Until then, please feel free to delete this pull request. I'll file another one if I find that it still isn't fixed.