From: Jean Privat <jean@pryen.org>
Date: Mon, 24 Feb 2014 20:53:12 +0000 (-0500)
Subject: Merge commit 'b7e675f'
X-Git-Tag: v0.6.4~17
X-Git-Url: http://nitlanguage.org

Merge commit 'b7e675f'

Partially fixes issue #276 and add the test to exhibit the remaining bad
behavior of the issue
---

bcb4ab0ae4268b32347e6f99094addaed7e11b5f