Commit a version of the patch for #125 for testing.

Originally submitted by:	@i2aaron
Revision 081ba8e seems to have addressed Issue 125, so remove this from
the set of known issues.
Merge branch 'features/issue-125'