bug 964335
Fixes Bug 964335
Merge pull request #352 from emersonveenstra/bug964335

Bug 964335