Dustin, I merged your fix to master + 4.1 branch. Thanks for the contribution!

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira