Merge query strings

If source and destination both have query strings, combine them using &.
Merge branch 'master' into jordan/merge-query-strings