grc: python 2.6 compatibility fix
Merge remote-tracking branch 'gnuradio-wg-grc/grc_py26_compat_fix' into maint
Merge branch 'maint'
Merge branch 'master' into next
cmake: backport parallel build fix to maint branch
cmake: add parallel build fix to gr_modtool template
Merge branch 'maint'
Merge branch 'master' into next