Fix for deserialising from streaming pickle, sometimes the second element is not iterable
Merge remote-tracking branch 'origin/master'