diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt
index f02c9210f8..9034c11e1b 100644
--- a/gr-utils/CMakeLists.txt
+++ b/gr-utils/CMakeLists.txt

diff --git a/gr-utils/python/blocktool/CMakeLists.txt b/gr-utils/blocktool/CMakeLists.txt
index 235f3e5666..235f3e5666 100644
--- a/gr-utils/python/blocktool/CMakeLists.txt
+++ b/gr-utils/blocktool/CMakeLists.txt

diff --git a/gr-utils/python/blocktool/README.blocktool b/gr-utils/blocktool/README.blocktool
index 0183b0093c..0183b0093c 100644
--- a/gr-utils/python/blocktool/README.blocktool
+++ b/gr-utils/blocktool/README.blocktool

diff --git a/gr-utils/python/blocktool/__init__.py b/gr-utils/blocktool/__init__.py
index a8206b76df..a8206b76df 100644
--- a/gr-utils/python/blocktool/__init__.py
+++ b/gr-utils/blocktool/__init__.py

diff --git a/gr-utils/python/blocktool/__main__.py b/gr-utils/blocktool/__main__.py
index 97c2f77f49..97c2f77f49 100644
--- a/gr-utils/python/blocktool/__main__.py
+++ b/gr-utils/blocktool/__main__.py

diff --git a/gr-utils/python/blocktool/cli.py b/gr-utils/blocktool/cli.py
index b5bf6390f1..b5bf6390f1 100644
--- a/gr-utils/python/blocktool/cli.py
+++ b/gr-utils/blocktool/cli.py

diff --git a/gr-utils/python/blocktool/core/CMakeLists.txt b/gr-utils/blocktool/core/CMakeLists.txt
index 697e477caf..697e477caf 100644
--- a/gr-utils/python/blocktool/core/CMakeLists.txt
+++ b/gr-utils/blocktool/core/CMakeLists.txt

diff --git a/gr-utils/python/blocktool/core/Constants.py b/gr-utils/blocktool/core/Constants.py
index be79631b97..be79631b97 100644
--- a/gr-utils/python/blocktool/core/Constants.py
+++ b/gr-utils/blocktool/core/Constants.py

diff --git a/gr-utils/python/blocktool/core/__init__.py b/gr-utils/blocktool/core/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/gr-utils/python/blocktool/core/__init__.py
+++ b/gr-utils/blocktool/core/__init__.py

diff --git a/gr-utils/python/blocktool/core/base.py b/gr-utils/blocktool/core/base.py
index 30c6577398..30c6577398 100644
--- a/gr-utils/python/blocktool/core/base.py
+++ b/gr-utils/blocktool/core/base.py

diff --git a/gr-utils/python/blocktool/core/comments.py b/gr-utils/blocktool/core/comments.py
index d7919609bb..d7919609bb 100644
--- a/gr-utils/python/blocktool/core/comments.py
+++ b/gr-utils/blocktool/core/comments.py

diff --git a/gr-utils/python/blocktool/core/iosignature.py b/gr-utils/blocktool/core/iosignature.py
index bf3f04d781..bf3f04d781 100644
--- a/gr-utils/python/blocktool/core/iosignature.py
+++ b/gr-utils/blocktool/core/iosignature.py

diff --git a/gr-utils/python/blocktool/core/outputschema.py b/gr-utils/blocktool/core/outputschema.py
index 4d1bcf88b7..4d1bcf88b7 100644
--- a/gr-utils/python/blocktool/core/outputschema.py
+++ b/gr-utils/blocktool/core/outputschema.py

diff --git a/gr-utils/python/blocktool/core/parseheader.py b/gr-utils/blocktool/core/parseheader.py
index 59d4ac33f3..59d4ac33f3 100644
--- a/gr-utils/python/blocktool/core/parseheader.py
+++ b/gr-utils/blocktool/core/parseheader.py

diff --git a/gr-utils/python/blocktool/tests/README.blocktool_test b/gr-utils/blocktool/tests/README.blocktool_test
index 1ca66e9c6e..1ca66e9c6e 100644
--- a/gr-utils/python/blocktool/tests/README.blocktool_test
+++ b/gr-utils/blocktool/tests/README.blocktool_test

diff --git a/gr-utils/python/blocktool/tests/sample_json/analog_agc2_cc.json b/gr-utils/blocktool/tests/sample_json/analog_agc2_cc.json
index fa9eae3551..fa9eae3551 100644
--- a/gr-utils/python/blocktool/tests/sample_json/analog_agc2_cc.json
+++ b/gr-utils/blocktool/tests/sample_json/analog_agc2_cc.json

diff --git a/gr-utils/python/blocktool/tests/sample_json/digital_additive_scrambler_bb.json b/gr-utils/blocktool/tests/sample_json/digital_additive_scrambler_bb.json
index 265b5a6ddc..265b5a6ddc 100644
--- a/gr-utils/python/blocktool/tests/sample_json/digital_additive_scrambler_bb.json
+++ b/gr-utils/blocktool/tests/sample_json/digital_additive_scrambler_bb.json

diff --git a/gr-utils/python/blocktool/tests/sample_yaml/analog_agc2_cc.yml b/gr-utils/blocktool/tests/sample_yaml/analog_agc2_cc.yml
index fef19eff95..fef19eff95 100644
--- a/gr-utils/python/blocktool/tests/sample_yaml/analog_agc2_cc.yml
+++ b/gr-utils/blocktool/tests/sample_yaml/analog_agc2_cc.yml

diff --git a/gr-utils/python/blocktool/tests/sample_yaml/digital_additive_scrambler_bb.yml b/gr-utils/blocktool/tests/sample_yaml/digital_additive_scrambler_bb.yml
index 0001653273..0001653273 100644
--- a/gr-utils/python/blocktool/tests/sample_yaml/digital_additive_scrambler_bb.yml
+++ b/gr-utils/blocktool/tests/sample_yaml/digital_additive_scrambler_bb.yml

diff --git a/gr-utils/python/blocktool/tests/test_blocktool.py b/gr-utils/blocktool/tests/test_blocktool.py
index 8c8a1686b1..8c8a1686b1 100644
--- a/gr-utils/python/blocktool/tests/test_blocktool.py
+++ b/gr-utils/blocktool/tests/test_blocktool.py

diff --git a/gr-utils/python/blocktool/tests/test_json_file.py b/gr-utils/blocktool/tests/test_json_file.py
index 7728e8b803..7728e8b803 100644
--- a/gr-utils/python/blocktool/tests/test_json_file.py
+++ b/gr-utils/blocktool/tests/test_json_file.py

diff --git a/gr-utils/python/modtool/CMakeLists.txt b/gr-utils/modtool/CMakeLists.txt
index 4b88bae791..4b88bae791 100644
--- a/gr-utils/python/modtool/CMakeLists.txt
+++ b/gr-utils/modtool/CMakeLists.txt

diff --git a/gr-utils/python/modtool/README.modtool b/gr-utils/modtool/README.modtool
index bffe49e9e2..bffe49e9e2 100644
--- a/gr-utils/python/modtool/README.modtool
+++ b/gr-utils/modtool/README.modtool

diff --git a/gr-utils/python/modtool/__init__.py b/gr-utils/modtool/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/gr-utils/python/modtool/__init__.py
+++ b/gr-utils/modtool/__init__.py

diff --git a/gr-utils/python/modtool/cli/CMakeLists.txt b/gr-utils/modtool/cli/CMakeLists.txt
index f00adfb4d8..f00adfb4d8 100644
--- a/gr-utils/python/modtool/cli/CMakeLists.txt
+++ b/gr-utils/modtool/cli/CMakeLists.txt

diff --git a/gr-utils/python/modtool/cli/__init__.py b/gr-utils/modtool/cli/__init__.py
index 65f3603113..65f3603113 100644
--- a/gr-utils/python/modtool/cli/__init__.py
+++ b/gr-utils/modtool/cli/__init__.py

diff --git a/gr-utils/python/modtool/cli/add.py b/gr-utils/modtool/cli/add.py
index e65bac1176..e65bac1176 100644
--- a/gr-utils/python/modtool/cli/add.py
+++ b/gr-utils/modtool/cli/add.py

diff --git a/gr-utils/python/modtool/cli/base.py b/gr-utils/modtool/cli/base.py
index 2462a71d88..2462a71d88 100644
--- a/gr-utils/python/modtool/cli/base.py
+++ b/gr-utils/modtool/cli/base.py

diff --git a/gr-utils/python/modtool/cli/disable.py b/gr-utils/modtool/cli/disable.py
index 87f891e1c3..87f891e1c3 100644
--- a/gr-utils/python/modtool/cli/disable.py
+++ b/gr-utils/modtool/cli/disable.py

diff --git a/gr-utils/python/modtool/cli/info.py b/gr-utils/modtool/cli/info.py
index df7a1f78b6..df7a1f78b6 100644
--- a/gr-utils/python/modtool/cli/info.py
+++ b/gr-utils/modtool/cli/info.py

diff --git a/gr-utils/python/modtool/cli/makeyaml.py b/gr-utils/modtool/cli/makeyaml.py
index 834cc05a21..834cc05a21 100644
--- a/gr-utils/python/modtool/cli/makeyaml.py
+++ b/gr-utils/modtool/cli/makeyaml.py

diff --git a/gr-utils/python/modtool/cli/newmod.py b/gr-utils/modtool/cli/newmod.py
index cdb4b56cfb..cdb4b56cfb 100644
--- a/gr-utils/python/modtool/cli/newmod.py
+++ b/gr-utils/modtool/cli/newmod.py

diff --git a/gr-utils/python/modtool/cli/rename.py b/gr-utils/modtool/cli/rename.py
index 86777fa3fb..86777fa3fb 100644
--- a/gr-utils/python/modtool/cli/rename.py
+++ b/gr-utils/modtool/cli/rename.py

diff --git a/gr-utils/python/modtool/cli/rm.py b/gr-utils/modtool/cli/rm.py
index f4447d750a..f4447d750a 100644
--- a/gr-utils/python/modtool/cli/rm.py
+++ b/gr-utils/modtool/cli/rm.py

diff --git a/gr-utils/python/modtool/cli/update.py b/gr-utils/modtool/cli/update.py
index 285007e15a..285007e15a 100644
--- a/gr-utils/python/modtool/cli/update.py
+++ b/gr-utils/modtool/cli/update.py

diff --git a/gr-utils/python/modtool/core/CMakeLists.txt b/gr-utils/modtool/core/CMakeLists.txt
index 764e79d09c..764e79d09c 100644
--- a/gr-utils/python/modtool/core/CMakeLists.txt
+++ b/gr-utils/modtool/core/CMakeLists.txt

diff --git a/gr-utils/python/modtool/core/__init__.py b/gr-utils/modtool/core/__init__.py
index 5f89eee30f..5f89eee30f 100644
--- a/gr-utils/python/modtool/core/__init__.py
+++ b/gr-utils/modtool/core/__init__.py

diff --git a/gr-utils/python/modtool/core/add.py b/gr-utils/modtool/core/add.py
index adacb1ef90..adacb1ef90 100644
--- a/gr-utils/python/modtool/core/add.py
+++ b/gr-utils/modtool/core/add.py

diff --git a/gr-utils/python/modtool/core/base.py b/gr-utils/modtool/core/base.py
index 4073756ca7..4073756ca7 100644
--- a/gr-utils/python/modtool/core/base.py
+++ b/gr-utils/modtool/core/base.py

diff --git a/gr-utils/python/modtool/core/disable.py b/gr-utils/modtool/core/disable.py
index 1fb4628312..1fb4628312 100644
--- a/gr-utils/python/modtool/core/disable.py
+++ b/gr-utils/modtool/core/disable.py

diff --git a/gr-utils/python/modtool/core/info.py b/gr-utils/modtool/core/info.py
index e242af0e6e..e242af0e6e 100644
--- a/gr-utils/python/modtool/core/info.py
+++ b/gr-utils/modtool/core/info.py

diff --git a/gr-utils/python/modtool/core/makeyaml.py b/gr-utils/modtool/core/makeyaml.py
index adf93cf4bd..adf93cf4bd 100644
--- a/gr-utils/python/modtool/core/makeyaml.py
+++ b/gr-utils/modtool/core/makeyaml.py

diff --git a/gr-utils/python/modtool/core/newmod.py b/gr-utils/modtool/core/newmod.py
index 1d22626e10..1d22626e10 100644
--- a/gr-utils/python/modtool/core/newmod.py
+++ b/gr-utils/modtool/core/newmod.py

diff --git a/gr-utils/python/modtool/core/rename.py b/gr-utils/modtool/core/rename.py
index d202d2375a..d202d2375a 100644
--- a/gr-utils/python/modtool/core/rename.py
+++ b/gr-utils/modtool/core/rename.py

diff --git a/gr-utils/python/modtool/core/rm.py b/gr-utils/modtool/core/rm.py
index 72c9da4666..72c9da4666 100644
--- a/gr-utils/python/modtool/core/rm.py
+++ b/gr-utils/modtool/core/rm.py

diff --git a/gr-utils/python/modtool/core/update.py b/gr-utils/modtool/core/update.py
index 2d3af1e7e0..2d3af1e7e0 100644
--- a/gr-utils/python/modtool/core/update.py
+++ b/gr-utils/modtool/core/update.py

diff --git a/gr-utils/python/modtool/modtool.conf.in b/gr-utils/modtool/modtool.conf.in
index 8b3df1b9cf..8b3df1b9cf 100644
--- a/gr-utils/python/modtool/modtool.conf.in
+++ b/gr-utils/modtool/modtool.conf.in

diff --git a/gr-utils/python/modtool/templates/CMakeLists.txt b/gr-utils/modtool/templates/CMakeLists.txt
index 80b9a8476c..80b9a8476c 100644
--- a/gr-utils/python/modtool/templates/CMakeLists.txt
+++ b/gr-utils/modtool/templates/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/__init__.py b/gr-utils/modtool/templates/__init__.py
index 3c185c93e1..3c185c93e1 100644
--- a/gr-utils/python/modtool/templates/__init__.py
+++ b/gr-utils/modtool/templates/__init__.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt
index 5f59fb2986..5f59fb2986 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/MANIFEST.md b/gr-utils/modtool/templates/gr-newmod/MANIFEST.md
index dce8fbd5e8..dce8fbd5e8 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/MANIFEST.md
+++ b/gr-utils/modtool/templates/gr-newmod/MANIFEST.md

diff --git a/gr-utils/python/modtool/templates/gr-newmod/apps/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/apps/CMakeLists.txt
index 0e1dfaee15..0e1dfaee15 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/apps/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/apps/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake
index 66016cb2ff..66016cb2ff 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake
+++ b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake

diff --git a/gr-utils/python/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake
index 786d8242b4..786d8242b4 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake
+++ b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake

diff --git a/gr-utils/python/modtool/templates/gr-newmod/cmake/Modules/targetConfig.cmake.in b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/targetConfig.cmake.in
index 4a1fb312d7..4a1fb312d7 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/cmake/Modules/targetConfig.cmake.in
+++ b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/targetConfig.cmake.in

diff --git a/gr-utils/python/modtool/templates/gr-newmod/cmake/cmake_uninstall.cmake.in b/gr-utils/modtool/templates/gr-newmod/cmake/cmake_uninstall.cmake.in
index 9ae1ae4bd6..9ae1ae4bd6 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/cmake/cmake_uninstall.cmake.in
+++ b/gr-utils/modtool/templates/gr-newmod/cmake/cmake_uninstall.cmake.in

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/docs/CMakeLists.txt
index 8b76ace40b..8b76ace40b 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/docs/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/README.howto b/gr-utils/modtool/templates/gr-newmod/docs/README.howto
index b29ce00579..b29ce00579 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/README.howto
+++ b/gr-utils/modtool/templates/gr-newmod/docs/README.howto

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/CMakeLists.txt
index a80d07ea4a..a80d07ea4a 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in
index 55816e8252..55816e8252 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
index 131648b2ab..131648b2ab 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/__init__.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/__init__.py
index b9476e6030..b9476e6030 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/__init__.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/__init__.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/base.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/base.py
index b204c004fe..b204c004fe 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/base.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/base.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/doxyindex.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/doxyindex.py
index 5da281a7f7..5da281a7f7 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/doxyindex.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/doxyindex.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/__init__.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/__init__.py
index 23095c1f34..23095c1f34 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/__init__.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/__init__.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compound.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compound.py
index acfa0dd5c6..acfa0dd5c6 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compound.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compound.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py
index 6e984e13ec..6e984e13ec 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/index.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/index.py
index 0c63512119..0c63512119 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/index.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/index.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py
index 11312db635..11312db635 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/text.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/text.py
index fa59668c01..fa59668c01 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/doxyxml/text.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/doxyxml/text.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/other/group_defs.dox b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/other/group_defs.dox
index 708f8c6d98..708f8c6d98 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/other/group_defs.dox
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/other/group_defs.dox

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/other/main_page.dox b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/other/main_page.dox
index 6357044912..6357044912 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/other/main_page.dox
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/other/main_page.dox

diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/swig_doc.py b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/swig_doc.py
index 288fed2aa7..288fed2aa7 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/swig_doc.py
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/swig_doc.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/examples/README b/gr-utils/modtool/templates/gr-newmod/examples/README
index c012bdfa0a..c012bdfa0a 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/examples/README
+++ b/gr-utils/modtool/templates/gr-newmod/examples/README

diff --git a/gr-utils/python/modtool/templates/gr-newmod/grc/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/grc/CMakeLists.txt
index 25ab1fd61f..25ab1fd61f 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/grc/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/grc/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/include/howto/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/include/howto/CMakeLists.txt
index f0aa72bb2f..f0aa72bb2f 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/include/howto/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/include/howto/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/include/howto/api.h b/gr-utils/modtool/templates/gr-newmod/include/howto/api.h
index c72d17b8c8..c72d17b8c8 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/include/howto/api.h
+++ b/gr-utils/modtool/templates/gr-newmod/include/howto/api.h

diff --git a/gr-utils/python/modtool/templates/gr-newmod/lib/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/lib/CMakeLists.txt
index 2330b72e20..2330b72e20 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/lib/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/lib/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/python/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/python/CMakeLists.txt
index a140eb618c..a140eb618c 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/python/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/python/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/python/__init__.py b/gr-utils/modtool/templates/gr-newmod/python/__init__.py
index 2a48948088..2a48948088 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/python/__init__.py
+++ b/gr-utils/modtool/templates/gr-newmod/python/__init__.py

diff --git a/gr-utils/python/modtool/templates/gr-newmod/swig/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/swig/CMakeLists.txt
index 71a19594b7..71a19594b7 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/swig/CMakeLists.txt
+++ b/gr-utils/modtool/templates/gr-newmod/swig/CMakeLists.txt

diff --git a/gr-utils/python/modtool/templates/gr-newmod/swig/howto_swig.i b/gr-utils/modtool/templates/gr-newmod/swig/howto_swig.i
index 2e24c12350..2e24c12350 100644
--- a/gr-utils/python/modtool/templates/gr-newmod/swig/howto_swig.i
+++ b/gr-utils/modtool/templates/gr-newmod/swig/howto_swig.i

diff --git a/gr-utils/python/modtool/templates/templates.py b/gr-utils/modtool/templates/templates.py
index fe799cd026..fe799cd026 100644
--- a/gr-utils/python/modtool/templates/templates.py
+++ b/gr-utils/modtool/templates/templates.py

diff --git a/gr-utils/python/modtool/tests/CMakeLists.txt b/gr-utils/modtool/tests/CMakeLists.txt
index 7c0473bcd9..7c0473bcd9 100644
--- a/gr-utils/python/modtool/tests/CMakeLists.txt
+++ b/gr-utils/modtool/tests/CMakeLists.txt

diff --git a/gr-utils/python/modtool/tests/__init__.py b/gr-utils/modtool/tests/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/gr-utils/python/modtool/tests/__init__.py
+++ b/gr-utils/modtool/tests/__init__.py

diff --git a/gr-utils/python/modtool/tests/test_modtool.py b/gr-utils/modtool/tests/test_modtool.py
index 89b665d0bd..89b665d0bd 100644
--- a/gr-utils/python/modtool/tests/test_modtool.py
+++ b/gr-utils/modtool/tests/test_modtool.py

diff --git a/gr-utils/python/modtool/tools/CMakeLists.txt b/gr-utils/modtool/tools/CMakeLists.txt
index 8248bb3e7d..8248bb3e7d 100644
--- a/gr-utils/python/modtool/tools/CMakeLists.txt
+++ b/gr-utils/modtool/tools/CMakeLists.txt

diff --git a/gr-utils/python/modtool/tools/__init__.py b/gr-utils/modtool/tools/__init__.py
index 55a55fd166..55a55fd166 100644
--- a/gr-utils/python/modtool/tools/__init__.py
+++ b/gr-utils/modtool/tools/__init__.py

diff --git a/gr-utils/python/modtool/tools/cmakefile_editor.py b/gr-utils/modtool/tools/cmakefile_editor.py
index 29f9c3eb09..29f9c3eb09 100644
--- a/gr-utils/python/modtool/tools/cmakefile_editor.py
+++ b/gr-utils/modtool/tools/cmakefile_editor.py

diff --git a/gr-utils/python/modtool/tools/code_generator.py b/gr-utils/modtool/tools/code_generator.py
index fb0d7da686..fb0d7da686 100644
--- a/gr-utils/python/modtool/tools/code_generator.py
+++ b/gr-utils/modtool/tools/code_generator.py

diff --git a/gr-utils/python/modtool/tools/grc_yaml_generator.py b/gr-utils/modtool/tools/grc_yaml_generator.py
index 07c00639cf..07c00639cf 100644
--- a/gr-utils/python/modtool/tools/grc_yaml_generator.py
+++ b/gr-utils/modtool/tools/grc_yaml_generator.py

diff --git a/gr-utils/python/modtool/tools/parser_cc_block.py b/gr-utils/modtool/tools/parser_cc_block.py
index 81c10f0cdc..81c10f0cdc 100644
--- a/gr-utils/python/modtool/tools/parser_cc_block.py
+++ b/gr-utils/modtool/tools/parser_cc_block.py

diff --git a/gr-utils/python/modtool/tools/scm.py b/gr-utils/modtool/tools/scm.py
index 707ed6754c..707ed6754c 100644
--- a/gr-utils/python/modtool/tools/scm.py
+++ b/gr-utils/modtool/tools/scm.py

diff --git a/gr-utils/python/modtool/tools/util_functions.py b/gr-utils/modtool/tools/util_functions.py
index d7f2b11317..d7f2b11317 100644
--- a/gr-utils/python/modtool/tools/util_functions.py
+++ b/gr-utils/modtool/tools/util_functions.py