Merge remote-tracking branch 'origin/master' into bugfix-nested-query