Fixed in #446. This has likely caused a merge conflict here.