fix assertion - buffer-id may become NBuffers, not NBuffers - 1
Merge branch 'master' into numeric
add macro definition for GPUPREAGG_AGGCALC_*