Don't include queued sites in the export
Merge remote-tracking branch 'upstream/master'