modtool: fixed order for both 3.6 and 3.7 API versions
Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtool
Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtool
Merge branch 'master' into next