ds: merged narwhal branch -> trunk
ds: merged narwhal branch -> trunk

weplay/query_reviewer,saimonmoore/query_reviewer,nesquena/query_reviewer,nofxx/query_reviewer,nofxx/query_reviewer,nesquena/query_reviewer,weplay/query_reviewer