Merge pull request #2577 from xmcclure/bugzilla-37834