Bug#811667: Fix in upstream

[Alberto Luaces]

Upstream's SVN has fixed this, however there are no new releases.  We
can either cherry pick those changes (just substituting false by 0) or
use the tip of the repository.