Fixed a bug in the serialization of query maps with more than 2 entries.
Merge remote-tracking branch 'upstream/master'