Fix needle-must-be-a-list crash.
Merge branch 'needle-must-be-a-list' into devel