fix #1, #2: merged devel into master
Merge tag '0.64' into devel
updated repeater_network2/inyector