only if they're there
Merge remote-tracking branch 'origin/qa' into qa