Problem: dropped & in last patch, causing segfault

Solution: run 'make check' before pushing commits :-)
Merge pull request #659 from hintjens/master

Problem: dropped & in last patch, causing segfault