Scott Marlow, I've pushed the fix to 5.1 branch. I'll wait to hear back from you before resolving this issue.