Remove a stray stringstream in QueryPlannerAccess
Merge remote-tracking branch 'upstream/master'