Subject: Bug#138: Possible fix

From: Josh Lukens <[email-masked]>
Date: Thu, 27 Feb 2014 10:24:58 -0500

Possible fix.  Note, this is built on top of changes submitted in bug 440.