diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py
index 266113b2b5..3b704240eb 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/__init__.py

diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 1fab5d90e0..8a639c8084 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt

diff --git a/gr-blocks/python/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt
index 841588799b..841588799b 100644
--- a/gr-blocks/python/CMakeLists.txt
+++ b/gr-blocks/python/blocks/CMakeLists.txt

diff --git a/gr-blocks/python/__init__.py b/gr-blocks/python/blocks/__init__.py
index 56d274918c..4274ac54ab 100644
--- a/gr-blocks/python/__init__.py
+++ b/gr-blocks/python/blocks/__init__.py

diff --git a/gr-blocks/python/parse_file_metadata.py b/gr-blocks/python/blocks/parse_file_metadata.py
index eaa8025bbf..eaa8025bbf 100644
--- a/gr-blocks/python/parse_file_metadata.py
+++ b/gr-blocks/python/blocks/parse_file_metadata.py

diff --git a/gr-blocks/python/qa_add_mult_div_sub.py b/gr-blocks/python/blocks/qa_add_mult_div_sub.py
index 0aca03d3fd..0aca03d3fd 100755
--- a/gr-blocks/python/qa_add_mult_div_sub.py
+++ b/gr-blocks/python/blocks/qa_add_mult_div_sub.py

diff --git a/gr-blocks/python/qa_add_mult_v.py b/gr-blocks/python/blocks/qa_add_mult_v.py
index 13cb71df2c..13cb71df2c 100755
--- a/gr-blocks/python/qa_add_mult_v.py
+++ b/gr-blocks/python/blocks/qa_add_mult_v.py

diff --git a/gr-blocks/python/qa_argmax.py b/gr-blocks/python/blocks/qa_argmax.py
index ec82b71cd4..ec82b71cd4 100644
--- a/gr-blocks/python/qa_argmax.py
+++ b/gr-blocks/python/blocks/qa_argmax.py

diff --git a/gr-blocks/python/qa_bin_statistics.py b/gr-blocks/python/blocks/qa_bin_statistics.py
index 666f7c0d68..666f7c0d68 100755
--- a/gr-blocks/python/qa_bin_statistics.py
+++ b/gr-blocks/python/blocks/qa_bin_statistics.py

diff --git a/gr-blocks/python/qa_boolean_operators.py b/gr-blocks/python/blocks/qa_boolean_operators.py
index 5572f60acb..5572f60acb 100755
--- a/gr-blocks/python/qa_boolean_operators.py
+++ b/gr-blocks/python/blocks/qa_boolean_operators.py

diff --git a/gr-blocks/python/qa_burst_tagger.py b/gr-blocks/python/blocks/qa_burst_tagger.py
index dfe9ec6429..dfe9ec6429 100644
--- a/gr-blocks/python/qa_burst_tagger.py
+++ b/gr-blocks/python/blocks/qa_burst_tagger.py

diff --git a/gr-blocks/python/qa_conjugate.py b/gr-blocks/python/blocks/qa_conjugate.py
index 1808aa9c0b..1808aa9c0b 100644
--- a/gr-blocks/python/qa_conjugate.py
+++ b/gr-blocks/python/blocks/qa_conjugate.py

diff --git a/gr-blocks/python/qa_delay.py b/gr-blocks/python/blocks/qa_delay.py
index 031cadb2d7..031cadb2d7 100755
--- a/gr-blocks/python/qa_delay.py
+++ b/gr-blocks/python/blocks/qa_delay.py

diff --git a/gr-blocks/python/qa_file_metadata.py b/gr-blocks/python/blocks/qa_file_metadata.py
index cf7a075f42..cf7a075f42 100644
--- a/gr-blocks/python/qa_file_metadata.py
+++ b/gr-blocks/python/blocks/qa_file_metadata.py

diff --git a/gr-blocks/python/qa_integrate.py b/gr-blocks/python/blocks/qa_integrate.py
index c404f1b309..c404f1b309 100755
--- a/gr-blocks/python/qa_integrate.py
+++ b/gr-blocks/python/blocks/qa_integrate.py

diff --git a/gr-blocks/python/qa_interleave.py b/gr-blocks/python/blocks/qa_interleave.py
index 376d487b10..376d487b10 100755
--- a/gr-blocks/python/qa_interleave.py
+++ b/gr-blocks/python/blocks/qa_interleave.py

diff --git a/gr-blocks/python/qa_keep_m_in_n.py b/gr-blocks/python/blocks/qa_keep_m_in_n.py
index 0898217ba9..0898217ba9 100755
--- a/gr-blocks/python/qa_keep_m_in_n.py
+++ b/gr-blocks/python/blocks/qa_keep_m_in_n.py

diff --git a/gr-blocks/python/qa_keep_one_in_n.py b/gr-blocks/python/blocks/qa_keep_one_in_n.py
index 8c5f44b84b..8c5f44b84b 100755
--- a/gr-blocks/python/qa_keep_one_in_n.py
+++ b/gr-blocks/python/blocks/qa_keep_one_in_n.py

diff --git a/gr-blocks/python/qa_max.py b/gr-blocks/python/blocks/qa_max.py
index 4af70bd4be..4af70bd4be 100755
--- a/gr-blocks/python/qa_max.py
+++ b/gr-blocks/python/blocks/qa_max.py

diff --git a/gr-blocks/python/qa_message.py b/gr-blocks/python/blocks/qa_message.py
index a556f65cee..a556f65cee 100755
--- a/gr-blocks/python/qa_message.py
+++ b/gr-blocks/python/blocks/qa_message.py

diff --git a/gr-blocks/python/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
index 169b4746c2..169b4746c2 100644
--- a/gr-blocks/python/qa_moving_average.py
+++ b/gr-blocks/python/blocks/qa_moving_average.py

diff --git a/gr-blocks/python/qa_multiply_conjugate.py b/gr-blocks/python/blocks/qa_multiply_conjugate.py
index f51563f854..f51563f854 100644
--- a/gr-blocks/python/qa_multiply_conjugate.py
+++ b/gr-blocks/python/blocks/qa_multiply_conjugate.py

diff --git a/gr-blocks/python/qa_mute.py b/gr-blocks/python/blocks/qa_mute.py
index 96c57b2ed1..96c57b2ed1 100755
--- a/gr-blocks/python/qa_mute.py
+++ b/gr-blocks/python/blocks/qa_mute.py

diff --git a/gr-blocks/python/qa_nlog10.py b/gr-blocks/python/blocks/qa_nlog10.py
index cc2a3e8cc5..cc2a3e8cc5 100755
--- a/gr-blocks/python/qa_nlog10.py
+++ b/gr-blocks/python/blocks/qa_nlog10.py

diff --git a/gr-blocks/python/qa_pack_k_bits.py b/gr-blocks/python/blocks/qa_pack_k_bits.py
index cd55d2f200..cd55d2f200 100755
--- a/gr-blocks/python/qa_pack_k_bits.py
+++ b/gr-blocks/python/blocks/qa_pack_k_bits.py

diff --git a/gr-blocks/python/qa_packed_to_unpacked.py b/gr-blocks/python/blocks/qa_packed_to_unpacked.py
index d84f5dbd37..d84f5dbd37 100755
--- a/gr-blocks/python/qa_packed_to_unpacked.py
+++ b/gr-blocks/python/blocks/qa_packed_to_unpacked.py

diff --git a/gr-blocks/python/qa_patterned_interleaver.py b/gr-blocks/python/blocks/qa_patterned_interleaver.py
index 3cf29c9178..3cf29c9178 100755
--- a/gr-blocks/python/qa_patterned_interleaver.py
+++ b/gr-blocks/python/blocks/qa_patterned_interleaver.py

diff --git a/gr-blocks/python/qa_pdu.py b/gr-blocks/python/blocks/qa_pdu.py
index c8fc0e5a91..c8fc0e5a91 100755
--- a/gr-blocks/python/qa_pdu.py
+++ b/gr-blocks/python/blocks/qa_pdu.py

diff --git a/gr-blocks/python/qa_peak_detector.py b/gr-blocks/python/blocks/qa_peak_detector.py
index c3ff2548c4..c3ff2548c4 100644
--- a/gr-blocks/python/qa_peak_detector.py
+++ b/gr-blocks/python/blocks/qa_peak_detector.py

diff --git a/gr-blocks/python/qa_peak_detector2.py b/gr-blocks/python/blocks/qa_peak_detector2.py
index b2d8e318dd..b2d8e318dd 100644
--- a/gr-blocks/python/qa_peak_detector2.py
+++ b/gr-blocks/python/blocks/qa_peak_detector2.py

diff --git a/gr-blocks/python/qa_pipe_fittings.py b/gr-blocks/python/blocks/qa_pipe_fittings.py
index 9894a5c211..9894a5c211 100755
--- a/gr-blocks/python/qa_pipe_fittings.py
+++ b/gr-blocks/python/blocks/qa_pipe_fittings.py

diff --git a/gr-blocks/python/qa_probe_signal.py b/gr-blocks/python/blocks/qa_probe_signal.py
index 6d25a25087..6d25a25087 100644
--- a/gr-blocks/python/qa_probe_signal.py
+++ b/gr-blocks/python/blocks/qa_probe_signal.py

diff --git a/gr-blocks/python/qa_regenerate.py b/gr-blocks/python/blocks/qa_regenerate.py
index a57eeba2bb..a57eeba2bb 100755
--- a/gr-blocks/python/qa_regenerate.py
+++ b/gr-blocks/python/blocks/qa_regenerate.py

diff --git a/gr-blocks/python/qa_repeat.py b/gr-blocks/python/blocks/qa_repeat.py
index 69fb3ef72d..69fb3ef72d 100755
--- a/gr-blocks/python/qa_repeat.py
+++ b/gr-blocks/python/blocks/qa_repeat.py

diff --git a/gr-blocks/python/qa_rms.py b/gr-blocks/python/blocks/qa_rms.py
index f3386668af..f3386668af 100644
--- a/gr-blocks/python/qa_rms.py
+++ b/gr-blocks/python/blocks/qa_rms.py

diff --git a/gr-blocks/python/qa_sample_and_hold.py b/gr-blocks/python/blocks/qa_sample_and_hold.py
index 59628090d1..59628090d1 100644
--- a/gr-blocks/python/qa_sample_and_hold.py
+++ b/gr-blocks/python/blocks/qa_sample_and_hold.py

diff --git a/gr-blocks/python/qa_stream_mux.py b/gr-blocks/python/blocks/qa_stream_mux.py
index 657bd3d63f..657bd3d63f 100755
--- a/gr-blocks/python/qa_stream_mux.py
+++ b/gr-blocks/python/blocks/qa_stream_mux.py

diff --git a/gr-blocks/python/qa_stretch.py b/gr-blocks/python/blocks/qa_stretch.py
index 078b404dbf..078b404dbf 100755
--- a/gr-blocks/python/qa_stretch.py
+++ b/gr-blocks/python/blocks/qa_stretch.py

diff --git a/gr-blocks/python/qa_tag_debug.py b/gr-blocks/python/blocks/qa_tag_debug.py
index ad85daebcc..ad85daebcc 100755
--- a/gr-blocks/python/qa_tag_debug.py
+++ b/gr-blocks/python/blocks/qa_tag_debug.py

diff --git a/gr-blocks/python/qa_threshold.py b/gr-blocks/python/blocks/qa_threshold.py
index f91af739ad..f91af739ad 100644
--- a/gr-blocks/python/qa_threshold.py
+++ b/gr-blocks/python/blocks/qa_threshold.py

diff --git a/gr-blocks/python/qa_throttle.py b/gr-blocks/python/blocks/qa_throttle.py
index 5d462f2c9f..5d462f2c9f 100755
--- a/gr-blocks/python/qa_throttle.py
+++ b/gr-blocks/python/blocks/qa_throttle.py

diff --git a/gr-blocks/python/qa_transcendental.py b/gr-blocks/python/blocks/qa_transcendental.py
index 8174f79630..8174f79630 100644
--- a/gr-blocks/python/qa_transcendental.py
+++ b/gr-blocks/python/blocks/qa_transcendental.py

diff --git a/gr-blocks/python/qa_type_conversions.py b/gr-blocks/python/blocks/qa_type_conversions.py
index eb1b42b636..eb1b42b636 100755
--- a/gr-blocks/python/qa_type_conversions.py
+++ b/gr-blocks/python/blocks/qa_type_conversions.py

diff --git a/gr-blocks/python/qa_unpack_k_bits.py b/gr-blocks/python/blocks/qa_unpack_k_bits.py
index e038d5a03a..e038d5a03a 100755
--- a/gr-blocks/python/qa_unpack_k_bits.py
+++ b/gr-blocks/python/blocks/qa_unpack_k_bits.py

diff --git a/gr-blocks/python/stream_to_vector_decimator.py b/gr-blocks/python/blocks/stream_to_vector_decimator.py
index c32ae6fce2..c32ae6fce2 100644
--- a/gr-blocks/python/stream_to_vector_decimator.py
+++ b/gr-blocks/python/blocks/stream_to_vector_decimator.py