Fix unpack and entities_with_components with > 2 args.
Merge remote-tracking branch 'upstream/master'