Proposed to upstream at http://sourceforge.net/tracker/index.php?func=detail&aid=3152423&group_id=18136&atid=118136