Merge remote-tracking branch 'leishman/ast-query'