crowbar/crowbar — pull request #1971 by vuntz (2013-12-24 08:25:01+00:00)
Title: Complete previous fix (7afd4aac)

There were other places where we had the bug.