[chirp_devel] [PATCH 0 of 3 ] More work from #1149